From nobody Wed Apr 29 14:47:51 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 4g5Ksh57PHz6bkRD for ; Wed, 29 Apr 2026 14:47:52 +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 4g5Ksh1DVwz4JSv for ; Wed, 29 Apr 2026 14:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777474072; 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=Fs3JOf/SrhKBdciUUaY476C8wtdAiUm4KGWB2K3npsg=; b=jbPGK4ZWyEtRaqKDaNp8f1y7YljXC+VnfzEY8GSk1n3kPuyScpOQ2r1d041p0nS5qxxXzN 4c8pFubY1LiyilSsLMAXA83VlJrpc/CvzsdzNCffHVaGaDsTkB1684bNZkNDTe4Y4bLv9v KxdEEtjyqtbDe+zAFmpVpCgVtd3gqoGzrSiQaE0s9BC9jr2kI/YQw6EQVxNuROWPTzpQFb PfU6k6P5477vZa+na4zt3CuiCD315PJOWYh41Of0q7nbaMqDLdsXv4VCBSMb27YYeuzvRp pzVfNQzj8uH6SxlBAvJ4GC/tQte3eiR0VAx3IepAEkR/jyuEdlIwbJtgqaegug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474072; a=rsa-sha256; cv=none; b=gfDhibSmZz2F1yvjENwMEwa7bgOzmihbCVQf3YofmU4ERXq0OqvDr4OBbO2lwhJdZLDrP0 GpwmHLTB/dPv4pqlIQ123eMGuNabmILoUh8l3RRcQG6k+PMpS7fLf9lpfPahSo3tVuhn+3 bVhopJixfspZbgp/Xqiz8cb2mUCUxNYNM0sFB8Q+EsXjfeCq5y8I/N605RPC0S7wJCkRvv 89VkO/MfRW6+6dIBiZduKFIjzfCTsUvd3oNpOgCt+cGVZWbrk/ALPJ5c+bPVa95Kp8NROF LILWeQrJKm+S/xEJL/1D+D9GNHW/qYUQYcaBAYhbDjdgfjJCYi8wFfzulDcY8w== 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=1777474072; 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=Fs3JOf/SrhKBdciUUaY476C8wtdAiUm4KGWB2K3npsg=; b=SeJ4DS4uxIxt6AcI8Sy2LFHbrDwhZKHM3gkL9BEkEupjSYsNnNzyik4Eq5u+ExsW/tPF3/ 9V2/VvUILbF0we+vHINz4bnj3JO7CDwvFLYw1c/7Rp7OS3yOQSNlMf6J71RpzET2Ro0owo diRGqSlaGgzKm35EatpCroH5dtvMKTncgGLN4rX8fSy6qHas/CAZHvf27aZ0S/K7eh/tbd VsVTjWw3Ag+5Ve74TK9dKhJRnD33RgQO9Qz0pLqWIE5tgtObPMaJWhU5kbgHr/n3LaPWBr pr0SzJL0kMq72HyEkPyGRm5nfcRDlwnoSIriXqmS6ALtzF8ay4GSj1AvvR1zNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5Ksg2dLfzl2X for ; Wed, 29 Apr 2026 14:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d056 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 14:47:51 +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: 025789eaa648 - stable/15 - libnv: switch fd_wait() from select(2) to poll(2) 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 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: 025789eaa648bdb3f3400f3d6412947cc151ebd8 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 14:47:51 +0000 Message-Id: <69f21a17.3d056.5fb3efcb@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=025789eaa648bdb3f3400f3d6412947cc151ebd8 commit 025789eaa648bdb3f3400f3d6412947cc151ebd8 Author: Mariusz Zaborski AuthorDate: 2026-04-28 14:35:10 +0000 Commit: Mark Johnston CommitDate: 2026-04-29 14:40:57 +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 +++---- lib/libnv/tests/nvlist_send_recv_test.c | 56 +++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/lib/libnv/msgio.c b/lib/libnv/msgio.c index f6f75241ff06..de2994e47fef 100644 --- a/lib/libnv/msgio.c +++ b/lib/libnv/msgio.c @@ -32,10 +32,10 @@ #include #include -#include #include #include +#include #include #include #include @@ -86,14 +86,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 diff --git a/lib/libnv/tests/nvlist_send_recv_test.c b/lib/libnv/tests/nvlist_send_recv_test.c index 4a5c10df656d..d655a26a7362 100644 --- a/lib/libnv/tests/nvlist_send_recv_test.c +++ b/lib/libnv/tests/nvlist_send_recv_test.c @@ -27,6 +27,8 @@ */ #include +#include +#include #include #include #include @@ -531,6 +533,59 @@ ATF_TC_BODY(nvlist_send_recv__send_nvlist__stream, tc) nvlist_send_recv__send_nvlist(SOCK_STREAM); } +/* + * Regression test for fd_wait(): the previous select(2)-based implementation + * called FD_SET() unconditionally, which is an out-of-bounds stack write when + * the socket fd is >= FD_SETSIZE. Force the socketpair fds above FD_SETSIZE + * and verify a full nvlist round-trip still works. + */ +ATF_TC_WITHOUT_HEAD(nvlist_send_recv__highfd); +ATF_TC_BODY(nvlist_send_recv__highfd, tc) +{ + struct rlimit rl; + nvlist_t *nvl; + int socks[2], hi_send, hi_recv, status; + pid_t pid; + + hi_send = FD_SETSIZE + 5; + hi_recv = FD_SETSIZE + 6; + + rl.rlim_cur = rl.rlim_max = hi_recv + 1; + if (setrlimit(RLIMIT_NOFILE, &rl) != 0) + atf_tc_skip("cannot raise RLIMIT_NOFILE: %s", strerror(errno)); + + ATF_REQUIRE(socketpair(PF_UNIX, SOCK_STREAM, 0, socks) == 0); + ATF_REQUIRE(dup2(socks[0], hi_recv) == hi_recv); + ATF_REQUIRE(dup2(socks[1], hi_send) == hi_send); + (void)close(socks[0]); + (void)close(socks[1]); + + pid = fork(); + ATF_REQUIRE(pid >= 0); + if (pid == 0) { + /* Child: send. */ + (void)close(hi_recv); + nvl = nvlist_create(0); + nvlist_add_string(nvl, "key", "value"); + if (nvlist_send(hi_send, nvl) != 0) + err(EXIT_FAILURE, "nvlist_send"); + nvlist_destroy(nvl); + _exit(0); + } + + (void)close(hi_send); + nvl = nvlist_recv(hi_recv, 0); + ATF_REQUIRE(nvl != NULL); + ATF_REQUIRE(nvlist_error(nvl) == 0); + ATF_REQUIRE(nvlist_exists_string(nvl, "key")); + ATF_REQUIRE(strcmp(nvlist_get_string(nvl, "key"), "value") == 0); + nvlist_destroy(nvl); + + ATF_REQUIRE(waitpid(pid, &status, 0) == pid); + ATF_REQUIRE(status == 0); + (void)close(hi_recv); +} + ATF_TC_WITHOUT_HEAD(nvlist_send_recv__send_closed_fd__dgram); ATF_TC_BODY(nvlist_send_recv__send_closed_fd__dgram, tc) { @@ -734,6 +789,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, nvlist_send_recv__send_nvlist__dgram); ATF_TP_ADD_TC(tp, nvlist_send_recv__send_nvlist__stream); + ATF_TP_ADD_TC(tp, nvlist_send_recv__highfd); ATF_TP_ADD_TC(tp, nvlist_send_recv__send_closed_fd__dgram); ATF_TP_ADD_TC(tp, nvlist_send_recv__send_closed_fd__stream); ATF_TP_ADD_TC(tp, nvlist_send_recv__send_many_fds__dgram);