From nobody Wed Nov 11 19:28:57 2026 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 4jPtqY5cDQz70dy3 for ; Wed, 11 Nov 2026 19:28:57 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPtqY2tGdz4F7b for ; Wed, 11 Nov 2026 19:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794425337; 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=1x+FOxjsnTsL/poy3tbmLyePkLTf+IyiXYcvg1afsT4=; b=awDM8cJQXlF2krG/WlaiPk5ibMCqhnCkA332YgXu7G5WeROavnVR6p2Q31nFjEnwk+zFJU IcP7oeJRguoToE8bYVo2SbQy1Tj0YkCYWfimsRda7rK91OSljVScyrIRCh8y9nlmgNWT/6 ip5l+jbN7kA0l5V8R3pBdH/Tv9Nw7brNZcbXTUR8nf6cjs6AjdbqLdFGtZVuMaKRZk4rOe ODWTeQhuQvMhWNo+OOZHy8Ogp0F0+fjXfEVQ8ubfaADerx3TjAZIkIcZzhFZKEA0A6jqKW /eeqqsdok4G6DJPPNWLn34midbJx/etoG+hc+XH0b5IrZuVo565qpd1MxexJAQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794425337; b=avhQzCB6z4x7FOPG1rxrnQVH1RFwRLX8eBSQ68+tDsQk5FjuBWAVmdqRJqv5snIPYknnmD Miu9m9iSiX7V7sJThFCf7TgqCCRrxMTn/arq8xgIofRZoOHMupXEbKwz1qz7i82+hw1kVi FdhzYuijZCKj9PJNxHBFRIbMWjlTdJ0FtpBbXk/pKZyb0b3rAwZQqcWaI5gyzKsyttE2nx 0xnfElAtjfet9drUmIbhzf6h9wjT86TS0myb4tqv43AP7I/L3O5LNDaojsZPUXVHGTnLqr xpQhbHirldJGnSqkRL0AS1Xw7eFNjLqHQpAQcaEjm7DdCdr1eCKM3PQ6iy3JWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794425337; 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=1x+FOxjsnTsL/poy3tbmLyePkLTf+IyiXYcvg1afsT4=; b=jmSqaZWDVOOUzTF2JD/A5r4c7QmgfcmJd1jePQlgXK6wPeVG6c4GnvlUDXR7ELSeEcTeuG h7yFEPGTlgv3GJ8wqB48BD0qerKRWqgY7dPL/pY+4/KScVVGjlBAPmRs+JS8909PvmqQM0 UHC26edMJ0hqSr0jnBd7gZDrdlFHoPWVh3w7T63/NBHPX5YYVnc4C1s8clDd6QEoEuw4av zQsINDQQlOYROHvhGb5KBPJ6dmPNJrnxS+tZpdpVvD3CT2raAQl3Taa97Unb8GUcW8vX0a S4vak8rygXzwMRTbR5wyGjK8cTXLLr1doj9j4V1vnOGWA4ELQvGt4liC/l6lCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jPtqY2GVBzS1g for ; Wed, 11 Nov 2026 19:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 467b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 19:28:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 41bdbe7dc06c - main - carp: Check if_carp under carp_sx in carp_nl_get() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41bdbe7dc06ca85baa774a97f585711e32544554 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 19:28:57 +0000 Message-Id: <6af4c1f9.467b.50067b9c@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=41bdbe7dc06ca85baa774a97f585711e32544554 commit 41bdbe7dc06ca85baa774a97f585711e32544554 Author: R. Christian McDonald AuthorDate: 2026-11-11 19:26:30 +0000 Commit: R. Christian McDonald CommitDate: 2026-11-11 19:27:57 +0000 carp: Check if_carp under carp_sx in carp_nl_get() carp_nl_get() tested ifp->if_carp for NULL before taking carp_sx and walked the softc list afterwards. When the last vhid on the interface is removed in between, carp_free_if() clears if_carp and the walk dereferences a NULL pointer. A reader that passes the check while the removal holds carp_sx always hits this. The check was done with the lock held until the ioctl(2) API was retired. Do it under the lock again. Reported by: Marcos Mendoza Fixes: 72472e52e310 ("carp: retire ioctl(2) API") Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netinet/ip_carp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 38a8769ac48c..5022763c3a2e 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -2580,16 +2580,17 @@ carp_nl_get(struct nlmsghdr *hdr, struct nl_pstate *npt) if ((error = carp_is_supported_if(ifp)) != 0) goto out; - if (ifp->if_carp == NULL) { - error = ENOENT; - goto out; - } - hdr->nlmsg_flags |= NLM_F_MULTI; privileged = (priv_check_cred(nlp_get_cred(npt->nlp), PRIV_NETINET_CARP) == 0); sx_xlock(&carp_sx); + if (ifp->if_carp == NULL) { + sx_xunlock(&carp_sx); + error = ENOENT; + goto out; + } + IFNET_FOREACH_CARP(ifp, sc) { struct genlmsghdr *ghdr_new;