From nobody Mon Sep 25 13:46:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RvPKq3lPyz4rMQ4; Mon, 25 Sep 2023 13:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RvPKq1lWTz4Mwk; Mon, 25 Sep 2023 13:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695649583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZM8tILfOkd7Mk+Pq56dRivU43wHAkPmM6DKZAYO92v8=; b=ms1G6imlEXnZDLb5o/vlKaDgSniYX1kCGK8JkF6/L7fAXNVAzYBgXa4sNMHimp58B0HGsO G12pZ81jwoE5PfWVynvwTh7S1vRdD6rSXKohBx+KDvYna0Rfh/32nUge7QdSfg9FimB4Ie m9k8EWMJl4T+0QYzXylPPKKDxwCNxjSav9yoQ+WvGU7nUTnZnJQTIXle2LpaNTvLgSbORy ez9fJm3XnoTgFIrzJE7lioaXYVo8oR0GSNRlN3qqz0gH5DZRqmSyJ3LWTji7fId/DzHTDs xliPrPxm7YmhPG14OatJhguy+qdtwCT70ooothyn4BFaFNvwYLM142bjO1ZR5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695649583; a=rsa-sha256; cv=none; b=iaTTXeiK8+EwNkOI+DGtNLGdC+/dtTmX091NCXgB7sYyT8b4woSAs4Ov+q/Gi6w9nSA+xf KxuXKVG0d6q+zf+LtBwhNrriY+L/+SK7BmrbbG3ls3Z9bNqoClvqW1lnETJYjABJH1KB9r RL2/I2ItLehmqm5ZJlPOEF3gCjgdqCWW+tTkIaIA3Ym1a95fv0YhSHal+t6uk0Jxl6AUzz saIYWJpOm6KgB/l2vw0pNCPQeGsxcuZualEE+i6Wg++Pb7J6UWMeXVaYsYIUqPX4mOM5iQ 2s0YtXKU7BYJpNovJR4jqbhV3qq5XHURDm2Nj2WuoPVo7A14UkTpebDKkGHr9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695649583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZM8tILfOkd7Mk+Pq56dRivU43wHAkPmM6DKZAYO92v8=; b=GPqFYkzq2iTZ9qA9cLXwjet8QYGxzuJMDc4wKBn4NoCHwKYCmyeLWStrOsOyCQopoWD9TP FwDQy3nq1gxqsHulh0roetOSP3Ax4LhtmPdaLjaQLFhAtPSVSj9fK3Qh+OrIJCO+fsTOXg D0Jnuefu9FntzQTMMGUK8eBZVW2Umesr/XkSn6HIXne0PqQUaMaaLUP+Ta3xazJKrFB5HT Ow/QTiCZ/8XGuq5lPFuPgrGIdlZSdxKOc57yLfShGE15MUGe5BJZ8/FLnB8oNMcKOlWfX9 lqSxV0dhV5wlRWyEz3//pwvloW+aaLn2ezNZVTsRCVuqWnn1eFYZW5i0a1V/FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RvPKq0ggzz26g; Mon, 25 Sep 2023 13:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PDkNeK027905; Mon, 25 Sep 2023 13:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PDkMra027903; Mon, 25 Sep 2023 13:46:22 GMT (envelope-from git) Date: Mon, 25 Sep 2023 13:46:22 GMT Message-Id: <202309251346.38PDkMra027903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e30f7d9b9bb4 - stable/14 - netlink: add unregister call in cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e30f7d9b9bb48368b49d815f519280b733959c81 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e30f7d9b9bb48368b49d815f519280b733959c81 commit e30f7d9b9bb48368b49d815f519280b733959c81 Author: Lin Ma AuthorDate: 2023-06-19 09:32:59 +0000 Commit: Ed Maste CommitDate: 2023-09-25 13:45:06 +0000 netlink: add unregister call in cleanup For protocols that use netlink (generic and route for now), the unint handler seems to have forgotten to call unregister, which will cause the assertion the next time the module is loaded. This patch adds unregister call to netlink_unregister_proto() for those handlers to avoid bad things happen. Reviewed-by: melifaro Fixes: 7e5bf68495cc ("netlink: add netlink support") Pull-request: https://github.com/freebsd/freebsd-src/pull/781 Signed-off-by: Lin Ma (cherry picked from commit 4bdf7f695184fb4312462ad475f3302c9da40f13) --- sys/netlink/netlink_generic.c | 1 + sys/netlink/netlink_route.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 54fc702d8ac6..b28b206a7ace 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -296,6 +296,7 @@ SYSINIT(genl_load_all, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, genl_load_all, NULL) static void genl_unload(void *u __unused) { + netlink_unregister_proto(NETLINK_GENERIC); EVENTHANDLER_DEREGISTER(genl_family_event, family_event_tag); genl_unregister_family(CTRL_FAMILY_NAME); NET_EPOCH_WAIT(); diff --git a/sys/netlink/netlink_route.c b/sys/netlink/netlink_route.c index 6da074926405..6b293f7ef19c 100644 --- a/sys/netlink/netlink_route.c +++ b/sys/netlink/netlink_route.c @@ -134,6 +134,7 @@ static void rtnl_unload(void *u __unused) { netlink_callback_p = nlbridge_orig_p; + netlink_unregister_proto(NETLINK_ROUTE); rtnl_ifaces_destroy(); rtnl_neighs_destroy();