From nobody Wed Apr 29 14:50:09 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 4g5KwM4b8jz6bkqS for ; Wed, 29 Apr 2026 14:50:11 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5KwL1wZXz4KxF for ; Wed, 29 Apr 2026 14:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777474210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lSgBViN3PPeawRw2RAfwxNpi1XTA1OOBfQo3BQPbaE=; b=pa/+1HWA7w1lPE+m/qIW/5mJKI1TT7f2QUHZkjO2jGE1kwdwoaec97M5P+Sfk+K5s/v9Yz j6FBnb0g/HnXYDMMXqKg/Ceyo3GpmluhES+pDQak2byzsiFbIib0Qx2cyB0AyCLwSTRX4D QJ2fe/+kyrMO/93JIbFkf+C8dbMikXPcMewsCeZANDTZBo6MLM3gbyGYMWAJfMBGgkUhL/ WNkp0ix2hGVwhCiJ4gvLsw3V+xJ/zJoLNGonWvJtEWHDF8I0rP+01V9KTbNqaVZdzIeyrQ HpZvmdjuXHZu8EoMzIIXesQDPfzh00h1zMcCGQ7NVpj0GOAIyrSXiT8yaqpO9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474210; a=rsa-sha256; cv=none; b=AFKQEdfwZDI1MzmsTcZeDFdwU54zEe3GRZ4DVrftIqezNQzgTFC/v14IQj7X4st7LB2jQq viLSmtr2RI5VZ9bDnZP7qX8NbXuVj+E/kL1cl71VCseVmZC1vsbvYmcrt9lH82rT0CZETr YaH8nlvwL7lxFUFEh2aE9cjYmB6Za89dXdjaSPFgXedui4VLN6n0c0SxN29u62nj6J8BnH I+EyzCr1Jkh+0z5B1b7uS43fXwigs9LDYeoHzZG1q6vgsTWLY4PdW62zCT12gKn0g2ZVpF bIpXQN2P7kXP0uaeMI1Cz64Iq9bhakNfcFk3EpO2ozhJfTORv9Z6gXBn6Jx5Aw== 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=1777474210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lSgBViN3PPeawRw2RAfwxNpi1XTA1OOBfQo3BQPbaE=; b=UX3aBNBshwaXedzOCTEb2ixJRA2gVx/8DEbOP0YBGtS7AgMKOxZxiE3RJOouxWqCLxj1DP fy0qpCnbTIxZMOB7A7FQpEOQdG/F5fjb7WBIz5GC19ADFe4EAhDuXGlRxfv/VOw6RvkFUH UaKkqlkON7rQkiXW8Ap/aeVqlLXFnZW9LXQ4Zpn2j8KzywYAF2acm7l94iIvIL/ZW9/M7o H2VdKvqznGZ2aSOfGEKwDXswq/kBrG3yOtJ5/HKtW5CZkShdINRHpDEVCJYJkk1HxWrXnd g2/I8T360T0kFsLDhTS2NJnDEPyYYxsEUZnqh3Go5x2W4jjBeAHrx+K8WIsYmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5KwL14vNzlbp for ; Wed, 29 Apr 2026 14:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d6a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 14:50:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mariusz Zaborski From: Mark Johnston Subject: git: 4acc2b5c61a7 - stable/13 - libnv: switch fd_wait() from select(2) to poll(2) 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 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/13 X-Git-Reftype: branch X-Git-Commit: 4acc2b5c61a7be9bbd88fe601a9bc0a044060d79 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 14:50:09 +0000 Message-Id: <69f21aa1.3d6a3.69ac1e9b@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4acc2b5c61a7be9bbd88fe601a9bc0a044060d79 commit 4acc2b5c61a7be9bbd88fe601a9bc0a044060d79 Author: Mariusz Zaborski AuthorDate: 2026-04-28 14:35:10 +0000 Commit: Mark Johnston CommitDate: 2026-04-28 19:36:05 +0000 libnv: switch fd_wait() from select(2) to poll(2) The previous implementation used FD_SET() on a stack-allocated fd_set, which is an out-of-bounds write whenever the socket fd is >= FD_SETSIZE (1024). Approved by: so Security: FreeBSD-SA-26:16.libnv Security: CVE-2026-39457 Reported by: Joshua Rogers of AISLE Research Team (https://aisle.com/) Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56689 --- lib/libnv/msgio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libnv/msgio.c b/lib/libnv/msgio.c index afc02dba7a46..e73484878ae7 100644 --- a/lib/libnv/msgio.c +++ b/lib/libnv/msgio.c @@ -33,10 +33,10 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -87,14 +87,14 @@ msghdr_add_fd(struct cmsghdr *cmsg, int fd) static void fd_wait(int fd, bool doread) { - fd_set fds; + struct pollfd pfd; PJDLOG_ASSERT(fd >= 0); - FD_ZERO(&fds); - FD_SET(fd, &fds); - (void)select(fd + 1, doread ? &fds : NULL, doread ? NULL : &fds, - NULL, NULL); + pfd.fd = fd; + pfd.events = doread ? POLLIN : POLLOUT; + pfd.revents = 0; + (void)poll(&pfd, 1, -1); } static int