From nobody Fri Sep 22 14:46:34 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 4RsZpg14g0z4tyYC; Fri, 22 Sep 2023 14:46:35 +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 4RsZpf4W77z3XYZ; Fri, 22 Sep 2023 14:46:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695393994; 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=kDG2BU0FxuUgAp5gTF3hafZ0rc2ULb3CWWssOgwkfmQ=; b=aK0e96IgzllTVGVpfiMmiKo7+HUCYDM7sIb23yX1Z/Or6U6chdstI/iqx8A5AJdolur8t3 eQR32NuxBPVJpMj1hSf3J1C5eRIH/BDbKLbOOZkFs/pxGBY4Lgp1nawyly7qBB3n4JJXDM zTY9aTl0R4kkJEeZBl2psUloPvnJTL96wL9EqPXHEqMJdruFxlAav3lvCfnjchMMm7mKpn VjRh42HiiMH2KPMaLNPdgIl4qy6VCYzaPl4EyBsK/efov3PKQWNE+ZPYWCqUGOqRglCupE dRXtbNFp6hHdXGRD2fEW5vepkpvLMh1mI+jVSDqkWpTJ1OYZArhwyBrvCvrCfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695393994; a=rsa-sha256; cv=none; b=g4r1UNE/jX8/7S1mUQwjlb/AVPJ/uyLhnaC17ECYIDarS3y+erM5bHo8xU3xf7zgaHdKF/ n70a4xtj8jcQ0A3jBhHARHJLCb5uLDqzG9qtEJE+69BIJTUxLtkmbvB3crOidH05VYCNXb ppHkm5UA9GeM3DBit6uInQArhWLa7YK4y1tfX+XLWJbc43SbmDa8z9raszQpykfLm7ozvq DkwrpZwv9Ko7xRLdEegDgjO80GvU3DlVVEjqwkAWvDq9x5hG/G+O5gFZtzVqxS8bgtbbYb plkeZF1rxuJkIg0pvgsmB/ttLy4GLamChhyfc8Dbjk69wxI4yVF+/MgDhXV9Bg== 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=1695393994; 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=kDG2BU0FxuUgAp5gTF3hafZ0rc2ULb3CWWssOgwkfmQ=; b=PwxYpCisjOaCSIY5H2ReZicx4xrdqmU16deLImZHoAdu7cbClggxkF2WDKgxETtGgFHTtB zOlbExmiORzkjo4X0v8L+zz+I5m+6I+SUFXHPBhWWoqfuNnQ5eALyHn1WI9wFx9RcNeFYG GkNP8XadMQxvdK3O9lPHeEyjYOsKsdru5h6bECUzfGy0gnzbvOQa14U6Pm7SITBYdwsF0/ JVOyQzHjJHSxyx/NEF1ziHd/LMnEpV5mW/890KJ8MZjmLXDMi2lUoI84LcPhOBSAoE6AWi C653/JbjkrIFqULZiAQdp9L8Qm4PqTjYXvkDsMAApKCfwnVbKaCi8DZTR9L4Fw== 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 4RsZpf3V9vzB9v; Fri, 22 Sep 2023 14:46:34 +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 38MEkYUB029891; Fri, 22 Sep 2023 14:46:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MEkYA6029888; Fri, 22 Sep 2023 14:46:34 GMT (envelope-from git) Date: Fri, 22 Sep 2023 14:46:34 GMT Message-Id: <202309221446.38MEkYA6029888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4bdf7f695184 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4bdf7f695184fb4312462ad475f3302c9da40f13 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4bdf7f695184fb4312462ad475f3302c9da40f13 commit 4bdf7f695184fb4312462ad475f3302c9da40f13 Author: Lin Ma AuthorDate: 2023-06-19 09:32:59 +0000 Commit: Ed Maste CommitDate: 2023-09-22 14:44:03 +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 --- 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();