From nobody Tue Nov 8 11:47:58 2022 X-Original-To: dev-commits-src-main@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 4N65vL45H2z4V1cV; Tue, 8 Nov 2022 11:47:58 +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 4N65vL3Qj7z4Fc1; Tue, 8 Nov 2022 11:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667908078; 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=fAVbvdHlv7g5RDmaVEUHSnJMWWSQRgpXF18NIb6s8mg=; b=otK6YXe10YLCdTa84aKv6w1C7TxK9mV4BknDawkDpomKIOMuhWhv+09h1G4x48Gjh7GddB u7lYtzesNuzpHv/5bXYnYTbWxnaNuywEHAZbpsTFPpbuLrdc4dorDniYiN72unJzGQx2Z4 HgU1Wp/KTI19OSKwQusdoNL5qud0Cph1nrsfaAFMV9coqDZqMo/f6ihp2/fxHGgAg95eYB X9uzysqsoRpdFBQ8MV322yGBCa8pG5fYNuoPZsw6ZqR/n4rvGEvsh2U5Ic4TxYklThycGA S+3Z+IerfTcdk1m8DT7odQpcSQ+vkYKTlaVILXdDjWUqaE+w0zHzfQjZlLrzug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667908078; 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=fAVbvdHlv7g5RDmaVEUHSnJMWWSQRgpXF18NIb6s8mg=; b=waSvzs/boDawB2tYi9BSfeCQuGyZfD4rEqHb747qjDusetG/Egp7+RGUT/dXYha6XW68Gk LfANwC9HHbzAOmS+kJhaOw/NwTf4lEeV+Xt4oSB5aXTnCi0qXH5eXKL3d9kMSC+K2BlosJ ImUl9NrsO5FMc0VXwIOs6clzwW0z7wYH/2JzzvJejl++MK4ZJ9bXGXvZ/2EsZvBXtc9W3O wga4Ja6ZonrLi1R80TOML6BHgX2qymznJmGFomlynjcFisfZXO+t1zwLAGUyLQSiWAakpL HhNBK0KJa0rlJeamvnjWgi7PdLGRX3y24hclqxIeHcRsqVbw/fpOTThHYI75lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667908078; a=rsa-sha256; cv=none; b=wZ2mCMlvgVghXTfhOuidvEiX1tavb6BRuU2Z9wzbtXSNObXyc0mqEZRNhDapUsaGOprXpH 91LBlYUiqHS2qkmRxFg55QUn0Lol3bhubF/hVz+/stnsZSlRP4DcylqzwfsB/Aem+MuOgL GiZJNfaM8P5kQT7JtPs4nHRHv1K5/ZUYkJ4WN4F0AHc1w4utkQELg3/r1oOj9Gy0pFMHWS 80A1fDqjj1WYE1d4HaqQRFbx7kiTCOGKb5GQY+UUGUEMGyOwgw+P/V4jfyYlsgAladsiuG jkMn0E/3e2c12OEPE9b8XMWXxZvLlSoy0knjDF7pL5rwNvxo7dSrw4OcD3RMdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N65vL2DchzhGH; Tue, 8 Nov 2022 11:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A8Blw5i073302; Tue, 8 Nov 2022 11:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A8BlwXN073301; Tue, 8 Nov 2022 11:47:58 GMT (envelope-from git) Date: Tue, 8 Nov 2022 11:47:58 GMT Message-Id: <202211081147.2A8BlwXN073301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 1edc3b6e5693 - main - netlink: unregister groups along with family List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1edc3b6e56932e423d778df484ffca3bd2af9e97 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1edc3b6e56932e423d778df484ffca3bd2af9e97 commit 1edc3b6e56932e423d778df484ffca3bd2af9e97 Author: Baptiste Daroussin AuthorDate: 2022-11-08 08:02:43 +0000 Commit: Baptiste Daroussin CommitDate: 2022-11-08 11:46:58 +0000 netlink: unregister groups along with family Differential Revision: https://reviews.freebsd.org/D37308 Reviewed by: melifaro --- sys/netlink/netlink_generic.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index de45048ff519..267024dfee4b 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -133,6 +133,22 @@ free_family(struct genl_family *gf) free(gf->family_cmds, M_NETLINK); } +/* + * unregister groups of a given family + */ +static void +unregister_groups(const struct genl_family *gf) +{ + + for (int i = 0; i < MAX_GROUPS; i++) { + struct genl_group *gg = &groups[i]; + if (gg->group_family == gf && gg->group_name != NULL) { + gg->group_family = NULL; + gg->group_name = NULL; + } + } +} + /* * Can sleep, I guess */ @@ -148,6 +164,7 @@ genl_unregister_family(const char *family_name) if (gf != NULL) { found = true; + unregister_groups(gf); /* TODO: zero pointer first */ free_family(gf); bzero(gf, sizeof(*gf));