From nobody Fri Aug 7 16:30:36 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 4hGqQ52SR1z6nMJn for ; Fri, 07 Aug 2026 16:30:37 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGqQ50F1dz41YZ for ; Fri, 07 Aug 2026 16:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786120237; 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=2j4N0AO/dUvwKk4Pf+t8ie+/Hq/oPxuauYUPoOASAUc=; b=TqIzK27P6cc/j3ZfA5W71ekOWS9yi8g/BVlKNo8CTshMk4naQx1HjwAE+vATMyzkKC8QTL xQ0qEUMIxTLtxG+k7+exDGk6YKeWdCWcUcMC10ZfvN4YrXhQr883oEm56xvAHvIvnB040h ebzbRa841EEE43LXmRD6vfZOzJoRs8ocjH12OnxzGTJsXCcootnr5763fo6YnFshkWlzoF diOBScbkjufoAVEOUH+2WG/44rgqgvvkC+ziCsWdlqVgeq4+Oxr0DT3bkf2poxTG44MihW 7i1w/y0lF3a0v5M+C91/m1PPx/9fKoUxDIXIefLI/AInfEAuF2kmyKqyhDsWRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786120237; a=rsa-sha256; cv=none; b=RNCEjgWisz8d/HecX81PGQOCgwSPOkY5mP3eU9KbtXmh2PP0JWTXoe/2J7OMyQ3+ZfouJk /469iFrAkj2WlFg7Pk7BP2qqN7NSJ/I6Mt+QzN4+fRzRrIRAtBc3n7Wh/ViREIHcavlHeK Uwqggr+ACcaxBG7K2A/7k6I9MkdLgLmDtYXfxCFj6fSZFdAA18KoHHaf0PW9joKRGyjR1c J400a9TnGZmIQ9k+HwNk3OpkBGYhU0R3nPVZ2JVcruAzue0PBhy+sT6fpd4zHO54CFNUEW 9R/hEJjodycg9YAaAi0BsQgBCZ3fH1Who3b26omsdMhEYpGLD7Yezi2h87eljg== 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=1786120237; 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=2j4N0AO/dUvwKk4Pf+t8ie+/Hq/oPxuauYUPoOASAUc=; b=scxX8xmDGPgVxuXcr7tTXvEV1qnKKxmn17eKNzsS8/1t+aQjzBBjfDyfSj9hck/2XsrqDm +o6QXnIrBv3CR0YnQteUAAQ7bBsT3A5hec9clddP20K95C5rkZezDz0kIsroAVlhrAkVHv djLssz8bYRQMCQKdWWztlIGGY9rHBBR9mp7VHlAg7S9yK+OS7l/h8kDccwsqjf6dYkcDux mZHIenwLuKf3uCOKB582de1L+f9lKftDtmn0z9jFCslefQwoiDI35/qKcVej4T0cx9APFr pXPIqRx7sbwd2bona84lYfWm2gDx5SxKUStiTHZD3MDF8SUOWW2NebR5tOM1pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGqQ4638fz1Dvb for ; Fri, 07 Aug 2026 16:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2135f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 16:30:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6de818285f06 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 6de818285f066c6705816674c671761dc09bff90 Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 16:30:36 +0000 Message-Id: <6a76082c.2135f.7ec41a03@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6de818285f066c6705816674c671761dc09bff90 commit 6de818285f066c6705816674c671761dc09bff90 Author: Mark Johnston AuthorDate: 2026-08-07 14:47:06 +0000 Commit: Mark Johnston CommitDate: 2026-08-07 16:30:24 +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 --- 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();