From nobody Mon Nov 10 18:53:10 2025 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 4d4zMB5PsFz6H6Pr; Mon, 10 Nov 2025 18:53:10 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d4zMB2Lt9z3HlQ; Mon, 10 Nov 2025 18:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800790; 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=lHIJ2M5jrvKeKX0qbTfcaV2PzQAYWufTtc8RLOoKTvM=; b=xivvKqkVQX1R5kpyndTmeiEOuvUI7HwZsSJkMwyOt501IOCJC+D3XVaUw+blZFL153fqMD IjsWkHXW/2XrZ8nk/9jW2nov1ZhqLCoF2FxAeXcmwfc+7cf7Vi9PbDEcdEx0XUFaudfZg3 wq9YFqvADCj6RHSTAqN3NMDWFjMBjbNSn3TaIsClrukGqrQ9zV5mPSUYmkecmg9IWMiqt5 WKyrHmPQ7tw/ui8AhKhAuGTzw/vHBbPuTxor5IttTxHE6Qom3h7Z48dV6AYNOrlw4JECKJ HSBatQyzVURPuUG5ACovFjE9JTwB3cL2CmMbXSgvDak7sehMMGgBNjgi8RC5YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800790; 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=lHIJ2M5jrvKeKX0qbTfcaV2PzQAYWufTtc8RLOoKTvM=; b=PrIcjhVFHVAAZuN50AE3rpu/zTHk5xGCWiIHb+14VmigDSyhETujZN0D1RYUDF4/wwuHaL NIdU0VyIlBU6sbaWV3LUBzVJSxbTt9aSQvU0mWQUakXzCLCRTV1h4RG6Ou3mr8uT95e4pf fhp3VbNf3XKTXLdZNKG/1fYAFHCgELRQhBYbYDthBxvLAzLz1tSKe9mUcfyanj1H3r9UFQ XzvlTN5OdIehIpLTU3VOsLXoNocmpkK2Fd0hbC4vRyRQSPdRDirwJ7XlxydOg+aUO40Vxl yNH99gntAFmL4R49CVp/cApy9CxzjTL0ScXR7eFrV/QA4oWq8KOiyrxPxfLvng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762800790; a=rsa-sha256; cv=none; b=yurQe3e1BzXOctiysvX759RpjRegl6J7lVFo7o86WAUxyOKG12/WwoqA7opePrpyVpC9yD bCTnd5vEp/Q2dexhfek7vtxrCjRAZHozgzbMyAMMcBALTZR4jcVZ8NaC2AbuYWzOwUvkBj shP/jpSlGC7p3YRZ1Vg7uHpC/uXCgBLRZcrIriiH0E65v9JqDFOpni2zYVvU/eRCLh5ZdA CsY3LGY7t4v2jzYZmY75/quJsS38Iuz8Y8R6fvPIS4ItkZqO29zAFGYpoiFJX/Gw2yDyLy 9v5kVpO5GdYNBWmph2gZ5eL20WU6RkFN5E0yz/ZWJsmh/TiQST0VGT1xk6AzjQ== 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 4d4zMB1qTtzVTf; Mon, 10 Nov 2025 18:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AAIrA0i092912; Mon, 10 Nov 2025 18:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAIrAqT092909; Mon, 10 Nov 2025 18:53:10 GMT (envelope-from git) Date: Mon, 10 Nov 2025 18:53:10 GMT Message-Id: <202511101853.5AAIrAqT092909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 40056e8abc42 - releng/15.0 - netlink: plug lock leak in genl_register_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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 40056e8abc4261651991320488d5e9a1068e6888 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=40056e8abc4261651991320488d5e9a1068e6888 commit 40056e8abc4261651991320488d5e9a1068e6888 Author: Bruno Silvestre AuthorDate: 2025-11-08 18:02:32 +0000 Commit: Colin Percival CommitDate: 2025-11-10 18:49:11 +0000 netlink: plug lock leak in genl_register_family() Approved by: re (cperciva) PR: 290893 (cherry picked from commit 335fc09ab8d25c3ced027d46f5a0f4103d5c8bee) (cherry picked from commit a3cd3a4fd68c8a2ea9264f168441a2ce7d51b4c8) --- sys/netlink/netlink_generic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 00f47e60f013..d20ec4c7545f 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -366,8 +366,10 @@ genl_register_family(const char *family_name, size_t hdrsize, GENL_LOCK(); for (u_int i = 0; i < MAX_FAMILIES; i++) if (families[i].family_name != NULL && - strcmp(families[i].family_name, family_name) == 0) + strcmp(families[i].family_name, family_name) == 0) { + GENL_UNLOCK(); return (0); + } /* Microoptimization: index 0 is reserved for the control family. */ gf = NULL;