From nobody Mon Jan 23 22:11:59 2023 X-Original-To: dev-commits-src-branches@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 4P148H4Jlxz2t0WT; Mon, 23 Jan 2023 22:11:59 +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 4P148H3m3jz3LJ1; Mon, 23 Jan 2023 22:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511919; 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=XsKf1RWcYGfOYQ3GFX81ygOK6Vtzud68PYTiWO7ZYFo=; b=NnQJ8XD9+l8btDA9JHHkgClKERHjybttWW9Fu8PQN/NyClpue4uwY6zfCqcaSe1iTlhxYN uCL0ip1IkQQRRn1S09zR+MmRRoPpvpOlRgnIlGjM+5Hn8316Yf/ujEbzl6hdtpESuHG2BQ 3Hkud6BTi5HrAjvPArfyVT/TdPc10JnKFG/9LOVJFtVeYVEPvPqVKWsHYBBpA+Xv1bcKog LTQ86vTQfErevl2HJikXy5jIoK2qRbX98Ye+ap7/+U6/aYmF0ec5T2AVler7KkaMIvTLd4 nzGR7KwlJt39TUCZxkX2MwJuBDLSKAFlbtAI8APpjFxVh8adNkmlpU08lpfSzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511919; 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=XsKf1RWcYGfOYQ3GFX81ygOK6Vtzud68PYTiWO7ZYFo=; b=fPlQaLPc22Oc7Fx41Np4W2m8xPEuSx1vClohVk57Dc7OfaJTkVCNfFltlgvZB9kWItPgLs JvnKTW+AhSoOQuwjew00wK8UYGG7uCJkkT2OBsqKGiVBmnVigBYWunYRqQJQXJtE2UU7FG sgcjvl4kCpFXqh9BOvGNYRFIPuumAbqTioqrJhkGjD1fPCbMrG9VWN72pqHJk8Ehnbkd0a 8vKnTGnfdJx4MJiSI2U5T/BvAMBxpmzEvD3dY2MD3RfNWENpmY6m/sFVCop+j8jSW0M13U GCPULQGS97CgQErMx/eapF9I5dAJBBj3wQpbJ69oJLMTuk2V5h8iJrv2kBuV2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511919; a=rsa-sha256; cv=none; b=E1V/gjUYH/I7eV9IlGjg0DlufuP9bWuEFlihpM1god5n+koUsh47TVV/koQTJjQ+EsE7W7 6LW0Gsac0+aITMaDiSGAU1jEqATy5iexx3jvEJyJdwthqFcUEYyTu6vqHBCBv/FNlQedaE pyJFlg+5aXt8edxrR3Qu3VqfswuWpKNtCuHbbG3WVg+13Mje1tQn8ofM2jhW857yJVVWux jn1MVvoJ9d9zq6lLDHjYX18ZCrY/m8Ccli2Gr/ePV/n+Nms1Orix2zkICbLYS/tV9IrHuZ 4O/kJ2J/yBBqiApSFbTwHqC54+d2j2Fvh++NOKAsNHCe7tRWdYIlIGcTYe9QGg== 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 4P148H2hXXzlnf; Mon, 23 Jan 2023 22:11:59 +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 30NMBxdE012822; Mon, 23 Jan 2023 22:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMBx8H012821; Mon, 23 Jan 2023 22:11:59 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:11:59 GMT Message-Id: <202301232211.30NMBx8H012821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: da988f405229 - stable/13 - netlink: unregister groups along with family List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: da988f405229e00480516cecb34d8c47f6bbfd88 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=da988f405229e00480516cecb34d8c47f6bbfd88 commit da988f405229e00480516cecb34d8c47f6bbfd88 Author: Baptiste Daroussin AuthorDate: 2022-11-08 08:02:43 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:04:03 +0000 netlink: unregister groups along with family Differential Revision: https://reviews.freebsd.org/D37308 Reviewed by: melifaro (cherry picked from commit 1edc3b6e56932e423d778df484ffca3bd2af9e97) --- 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));