From nobody Wed Apr 29 14:50:21 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 4g5Kwb0KY3z6bkqy for ; Wed, 29 Apr 2026 14:50:23 +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 4g5KwZ0xR0z4LBX for ; Wed, 29 Apr 2026 14:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777474222; 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=iH+FKzlj3qm3HXIykv0Zqg8ZobYrLwLnv0/FeMY9KkQ=; b=gXWqfVdNZmWZtAFvTScuuVVE5cfzUzb4mD2cEiNWV5+xC43ywexSe3UbCACGu26HhPnz8e +5jOK4pPkyCI8syWWxDD6IXL+1T3CETobU1Rva1pr0Ti+ZLIY6lFHKTedu86MqN5O2EmKY W5NFSzZoWZQLVIqSPn5V9DJj8+9iCsWVoKe2f3cRl8TfH89lAEqOv/0rXlrvRlDcMWOnyl 9McItAvx/ZlnAhfCZ3Z9m3L4+Aj7Z7oC2nSCatvK/AUEOFxRKU95bmPeCYxzgc2THsb41T LxleQ+n/DrodveHocKepctLk34X8F1Bc5rJqPygiC/jTL0l6dWfqOX6OfCWMOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474222; a=rsa-sha256; cv=none; b=KKQxW0ZB7RZGckwQYCO07nqYimgs5gxnwBvew/nq/avXkkVI7dBOuA7MJ9DrjSJRKrYeKc pzhGWdl2q7yaATdpUh5RLeNIe/PrZG4et2uvL/5mvEnwcOFwjvT06aKnXO1AVEY6Xthzrj LTUzOoPpUl5Clvmza6CIwP7A3be5SFHtEPG83cPLzdmpOzqbNbn3MQcqS6ZTzYleTyhO88 /8cZoWowaGxWiXeiB+t7o8SZjn99gyCN9JYTl9P8b5+noKYyDbBASZv4qbYd89+vx5yqcR o/Ud3+mTM04DsMP9AOyw+13hf6SAF9KTzT43r3H4upqDfo3vO+84i4iTB20Y+g== 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=1777474222; 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=iH+FKzlj3qm3HXIykv0Zqg8ZobYrLwLnv0/FeMY9KkQ=; b=e75nS8ZDVaQcedSE/wZhdfHNwj4THaAXrVVuQAQOPcmfftwa7a7lVPgjoFNYtl2a75RJdj q/VHNI/Wd8snGRa2myJcHQYU5p8o7re7n5sjkBBFwvCeqKHgzqB8a1yTxN8i2I6nyXAjyT /Fh5FAf9mvY57g5YgHxJhzu9bqeHMiudAMQy/EDT2obUTwXJylIk6i+a8XbYLx/JB4hLGy KIPae1Vp09rlRgtxK8SliqnQufa0HffG0a+W61RHFlh1NY6iTEs+fuV0e6dUOV4mn/Itze pJtD5lGyLXwXY8yIlaZmbMh5P2y1AHZ1F2b4AD2FgczjkzrN4t5OZSeCPoTtZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5KwY3qGHzl7g for ; Wed, 29 Apr 2026 14:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dab7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 14:50:21 +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: 32d12677ff45 - releng/13.5 - 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 32d12677ff45da6b3152803430990997c3f218b1 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 14:50:21 +0000 Message-Id: <69f21aad.3dab7.55ef193d@gitrepo.freebsd.org> The branch releng/13.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=32d12677ff45da6b3152803430990997c3f218b1 commit 32d12677ff45da6b3152803430990997c3f218b1 Author: Mariusz Zaborski AuthorDate: 2026-04-28 14:35:10 +0000 Commit: Mark Johnston CommitDate: 2026-04-28 20:32:11 +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