From nobody Mon Aug 24 18:49:05 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 4hTKh12Pt1z6pl3d for ; Mon, 24 Aug 2026 18:49:05 +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 4hTKh119d9z3Wgf for ; Mon, 24 Aug 2026 18:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787597345; 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=DK82oLNJ/VAihvvsTPGYwEYUR2A8ValcHnYpIshoxdQ=; b=cRoKdADc93Olaq1aRuPRBwDCI5+ywhdyd39mks589bdSH9Pl0pAlppX6ZHoBEco0mQ4yWu bIxEhID+JoCWzn9XhETEYHwkg/XaQLkw1Yk1YVELVKqZCI2t7Y9on88I0//D0fvt/ffl4e Lhw89S83l6J0Z/Ys/hON0C9ulq3bkiY0GnxA2tDv1odMBq1+sggU01ij9lHjum3fveueQo VDGUw5VROtoiULe+COA00g65YwOEx7BUqU/YFYmElpVy83WBFDfefNLa2ZW4zxGOhFdYSC qaNtXTImhG47XUtvMKXQkW0qBt+sWLHBReie9mh7Vr+88XQFmORsNhxK5SYc0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787597345; a=rsa-sha256; cv=none; b=vXyN2rJdDu7tFBDFx5+gwEhr0QUPM8tERt2afs5l7sD4uN/n4AshRxsylzSfyW33k4Cnbz gPZBN+zKiDyt4jdcI3ovkGSYQL7TH9vZqJlzzQNV2inhZ76Q2Cs3RpnfHjLpVBhRWE+GNH OUNXiR1KGpqyWmC5JWuzzDGs5+DPfF+l/eIUm3/jq+jVEQkcLwMbozc2Wboxt3GKT/E0E6 3ugJXRgQZ8W4tuMbIhd9x8GN4cNXaDJKswyRbtIVNrsHo+cj+goVBh6gIrlgSNYzngeQpA UtwvWLWeMCxS1tb4100W0dMMRzQ4pkz3rFsdn2WH/7qWLqPGOKxXroXqoWcZXA== 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=1787597345; 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=DK82oLNJ/VAihvvsTPGYwEYUR2A8ValcHnYpIshoxdQ=; b=p9rGHfooksQkUCPnH9B2StI27qKKaVnbOMQPB5rEuIASDYB8gyOVVWn/UT5dX6Zvb7A6Nt Z9UVm+8tZQvgbMOZgJQ/Xlu8c/EMlfvp8JQWYcLovO6S+/41MUK8qbQDBNsadaGcLutHKA aqWionmNnrddizRk9ZhuRgZx/sR9i0nqxEtx80s9Xkk4ra1RfJpI3SPJjowlcfVsqqbzZC XghwsELOMiA/dKny+GQOyPmn7wfJixynggIgNo28gd8JrM7t6Dvm3DcAWHxgbPkixKx2ht 8f6uXXR+kk9YnoKZJ0Qh0WTYCBf/qi5zULoP2sfzzKk/cKWQ7Mh/Pg2wWRl9Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTKh107xKz2JR for ; Mon, 24 Aug 2026 18:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39944 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 18:49:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6420ead539dd - stable/14 - netmap: Fix a race in kqueue registration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 6420ead539ddcc7026933888665b7e4f5f0eb9cd Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 18:49:05 +0000 Message-Id: <6a8c9221.39944.589e69a6@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6420ead539ddcc7026933888665b7e4f5f0eb9cd commit 6420ead539ddcc7026933888665b7e4f5f0eb9cd Author: Mark Johnston AuthorDate: 2026-08-07 14:47:06 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 18:48:15 +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 4c3aa5be0cce..615801acdd5e 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -1428,24 +1428,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();