From nobody Mon Aug 24 16:29:58 2026 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 4hTGbW3sdZz6pbf0 for ; Mon, 24 Aug 2026 16:29: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTGbW1B0Kz41PJ for ; Mon, 24 Aug 2026 16:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787588999; 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=H6Q58j7dh0Mzhxk45Met0sNY4pHhSwRsUXkVy7lYzWA=; b=G22IK/DXwzDbIvAFGT0PHoW27Fqxh7wFo0lwJ5glH/WY2wqrAgbP63gVq0X6v35qXqa2dN oIrfimHbMxvo+WcBL4paTPuAKwtzs0WSOs2hTx0/xt0lsn4LbqakGBMy23MbvHwXNV64Cd 3x4RaQjKpWjpgtj2hR1Tj0dSUNfU0HxZhqcDMnlPl8GSeOQ9q0QSoQ+24Dus6NM97yBxLF 5vDtwDjyeAI3vpDcnWOE/QZknYnNzxsgsOvLWJozs5nwzQczZKpRdBIJzWMxGWXB/TH/B+ 3xlweStRlvetXCvY+c18iSgRsc7Fb7mo76ZzlpomPUBTKQzZA13t+qt2hF35kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787588999; a=rsa-sha256; cv=none; b=VKVmQ2iQt9AEPXqE1mHHCXfR2IoiU1P4gRodLXlNT0rNL/qh2g/ezVEKI2G5mpqkT0K7G0 iEq9b414Ux/QqnqsG0wry0xyxXYllo1rMX9uNnP/e14LwWRkm4/Wref6qUg8PBGrQqkHD5 WgxebWTUbxJEWQpyb0nadfDSFWA7UKSFYTKUBAx7eZA478E2T4auI+nH+QzRe5Tx3v7UdP crJDr24smkSE7V696lhZvIerNSDDpyH1tMYRMsH2zPrBm3G1R/tWRlKTTOy3Y5kcGVsfx2 uo2rd/U+fOcoIqwEOvUtEJWlRifoCL+F2RZ1xLme62NnP6h+niKOAJNe4XbZfA== 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=1787588999; 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=H6Q58j7dh0Mzhxk45Met0sNY4pHhSwRsUXkVy7lYzWA=; b=rl/GJ/+IrL77shyvVhgiPPLkxaeeLIBQ6Y/CQgTA0viRTL0VK9/Pv8eQxfYefw5sT+AgkA EHvTZD0H/PiSp2KNBgZi8P1cfpZNpRBmuNc1LTvRFF0F799/UnWRUiIe9Q+zbIRpcx0XIX rILjz+OloPlIONcftxXUup2LeokYtlhGTPp9kxt3odq2xpBbizm6TzUT9cqlYZyZUZzYaA wLdhmcspc9Yp1SwV2SBHUQ98PqCaiiszVi9qLI7mS0KeNsFElbBzs3qyKAA1gQ+scYJAkR P7HfnD6ml34jywgEhEuUKczj1y8bjNF3MMn8FyyWGWwCOTHO+yDzaLg4DEfbCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTGbW03QLz1BVs for ; Mon, 24 Aug 2026 16:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2192f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 16:29:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: be37b1e0ba79 - stable/15 - netmap: Fix a race in kqueue registration 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 List-Id: 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: be37b1e0ba7944a77bddc9124f1f4a57195ef37d Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 16:29:58 +0000 Message-Id: <6a8c7186.2192f.6e35767c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=be37b1e0ba7944a77bddc9124f1f4a57195ef37d commit be37b1e0ba7944a77bddc9124f1f4a57195ef37d Author: Mark Johnston AuthorDate: 2026-08-07 14:47:06 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 15:17:54 +0000 netmap: Fix a race in kqueue registration We need to acquire the netmap global lock earlier, to avoid racing with the NETMAP_REQ_REGISTER ioctl handler. Reported by: syzkaller Reviewed by: vmaffione MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58677 (cherry picked from commit 6de818285f066c6705816674c671761dc09bff90) --- sys/dev/netmap/netmap_freebsd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index 2241bfc970a6..409b273e6442 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -1452,24 +1452,24 @@ netmap_kqfilter(struct cdev *dev, struct knote *kn) if (ev != EVFILT_READ && ev != EVFILT_WRITE) { nm_prerr("bad filter request %d", ev); - return 1; + return EINVAL; } error = devfs_get_cdevpriv((void**)&priv); if (error) { nm_prerr("device not yet setup"); - return 1; + return error; } + NMG_LOCK(); na = priv->np_na; if (na == NULL) { + NMG_UNLOCK(); nm_prerr("no netmap adapter for this file descriptor"); - return 1; + return ENOENT; } /* the si is indicated in the priv */ si = priv->np_si[(ev == EVFILT_WRITE) ? NR_TX : NR_RX]; - kn->kn_fop = (ev == EVFILT_WRITE) ? - &netmap_wfiltops : &netmap_rfiltops; + kn->kn_fop = (ev == EVFILT_WRITE) ? &netmap_wfiltops : &netmap_rfiltops; kn->kn_hook = priv; - NMG_LOCK(); si->kqueue_users++; nm_prinf("kqueue users for %s: %d", si->mtxname, si->kqueue_users); NMG_UNLOCK();