From nobody Wed Apr 29 14:47:25 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 4g5KsB3tlhz6bkQd for ; Wed, 29 Apr 2026 14:47:26 +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 4g5KsB1H3Kz4J2L for ; Wed, 29 Apr 2026 14:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777474046; 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=TxGknVMLF4l1tPRlOYHAycYyZwP7HFIKr8/p5KB+XBs=; b=KikWgTWLor28nUTPmRiUzbgAiqD+GxhFgQFSQZ0uo8nQOKb+XEhzw4GhY7DcgSkp3LMpGl oYPU50yvLa9O8coBw9nhpwDK378QsTkgcSaP28D3Ye4sf00QwP/k1RVfVA06liAftKvtRK uqfnMKThlxmGYm6aauze/KDcScl7lUB1q55CcKPblKOXBphJbD6febMvQ6YUpu6bu9CNzG JKcK81sYGiMk+Hty2iLvSjIXEyWML0QY7QC0wNAitr63PFVZt43yuaBRoTFDY/UJoJrF0i Yy7sD7KY8qzPNfI49BqVz3hpIgw20vebwTFCxyBFbYk7jQnZVHNKHGZemLve0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474046; a=rsa-sha256; cv=none; b=KsYAihK+LkiaIYwkEiGKMGqu8sGOb4WZ4VPdFP9jw8YbQvYGHPrRYjBulbgBIxw9uO6PGW 5e5+FheTewH2vruiXUgWJkSKe3Ehi8ntdmFVY6ZFG0lHKg+sSgX5QRDwvjRwwl6i59SwiK nZymNDTbv4D1gNQs6cQeiS68EPfCihh0BMJxrJk63PuAox0jUzdwRX7oiOYZi2bI7qDfsF gizuompPzIbuE7kX9nH2J84Y95JLaRNgKcptSnGNk4Gx8MQR7JdS/JbwnAKjclu99kv5ty +QWoAf2sl+Q2brkILkCC/wh65eAe9Zx3TXGj+BoXXvNmfxhln5HAq5W56cPqRw== 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=1777474046; 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=TxGknVMLF4l1tPRlOYHAycYyZwP7HFIKr8/p5KB+XBs=; b=QIGSS16H9GLl6mtGO5/uqIT0VobQRLls6XeIYbe2upNZEpQEyU0566HMQskUreUjrt5bCD dk44lsLgLMn0mEJ2beuceHxYGsRIh4G+1b5MiNg8OUJ6CVmYGbm5z8fDKBAYbUrNlINmDf fdOaS08jEpSZ6sENB1RrUv60VbwUnc4exNQBsRBzWN3+0J2rle0yQ2Zud/CubDDmJab09/ QbJyU7u4T5F4+/3lMVxn076bPbQuydSGZzaCVICZII8HMAEkTLF2gt702p71GpvCRnLCQ+ +AmJMBJBNAl8aKxM0EeOzIz90tdDxuipnBzcXg/BHHT//xBwkUA2lFudhCI0eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5Ks94xzWzlKZ for ; Wed, 29 Apr 2026 14:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b8c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 14:47:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Mariusz Zaborski From: Mark Johnston Subject: git: e2219bbd634f - main - libnv: fix heap overflow in nvlist_recv() 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/main X-Git-Reftype: branch X-Git-Commit: e2219bbd634f673f774ddf118dfe19e531e08a45 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 14:47:25 +0000 Message-Id: <69f219fd.3b8c3.e812904@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e2219bbd634f673f774ddf118dfe19e531e08a45 commit e2219bbd634f673f774ddf118dfe19e531e08a45 Author: Mariusz Zaborski AuthorDate: 2026-04-28 14:36:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-29 14:39:28 +0000 libnv: fix heap overflow in nvlist_recv() nvlist_check_header() validated nvlh_size for overflow before performing conversion. An mallicous user can set NV_FLAG_BIG_ENDIAN in the header and craft nvlh_size so that the orginall value passes the check, but after the conversion the sizeof(nvlist_header) + size can overflow. This can lead to a heap buffer overflow. Approved by: so Security: FreeBSD-SA-26:17.libnv Security: CVE-2026-35547 Fixes: 36fa90dbde0060aacb5677d0b113ee168e839071 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56342 --- lib/libnv/tests/nvlist_send_recv_test.c | 57 +++++++++++++++++++++++++++++++++ sys/contrib/libnv/nvlist.c | 9 +++--- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/lib/libnv/tests/nvlist_send_recv_test.c b/lib/libnv/tests/nvlist_send_recv_test.c index d655a26a7362..306c91560400 100644 --- a/lib/libnv/tests/nvlist_send_recv_test.c +++ b/lib/libnv/tests/nvlist_send_recv_test.c @@ -1,5 +1,8 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013 The FreeBSD Foundation + * Copyright (c) 2024-2026 Mariusz Zaborski * * This software was developed by Pawel Jakub Dawidek under sponsorship from * the FreeBSD Foundation. @@ -661,6 +664,58 @@ ATF_TC_BODY(nvlist_send_recv__overflow_header_size, tc) } } +ATF_TC_WITHOUT_HEAD(nvlist_send_recv__overflow_big_endian_size); +ATF_TC_BODY(nvlist_send_recv__overflow_big_endian_size, tc) +{ + static const unsigned char payload[] = { + 0x6c, /* magic */ + 0x00, /* version */ + 0x80, /* flags: NV_FLAG_BIG_ENDIAN */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, + }; + nvlist_t *nvl; + int sv[2]; + + ATF_REQUIRE_EQ(socketpair(AF_UNIX, SOCK_STREAM, 0, sv), 0); + ATF_REQUIRE_EQ(write(sv[1], payload, sizeof(payload)), + (ssize_t)sizeof(payload)); + ATF_REQUIRE_EQ(close(sv[1]), 0); + + errno = 0; + nvl = nvlist_recv(sv[0], 0); + ATF_REQUIRE(nvl == NULL); + ATF_REQUIRE_EQ(errno, EINVAL); + + ATF_REQUIRE_EQ(close(sv[0]), 0); +} + +ATF_TC_WITHOUT_HEAD(nvlist_send_recv__overflow_little_endian_size); +ATF_TC_BODY(nvlist_send_recv__overflow_little_endian_size, tc) +{ + static const unsigned char payload[] = { + 0x6c, /* magic */ + 0x00, /* version */ + 0x00, /* flags */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + }; + nvlist_t *nvl; + int sv[2]; + + ATF_REQUIRE_EQ(socketpair(AF_UNIX, SOCK_STREAM, 0, sv), 0); + ATF_REQUIRE_EQ(write(sv[1], payload, sizeof(payload)), + (ssize_t)sizeof(payload)); + ATF_REQUIRE_EQ(close(sv[1]), 0); + + errno = 0; + nvl = nvlist_recv(sv[0], 0); + ATF_REQUIRE(nvl == NULL); + ATF_REQUIRE_EQ(errno, EINVAL); + + ATF_REQUIRE_EQ(close(sv[0]), 0); +} + ATF_TC_WITHOUT_HEAD(nvlist_send_recv__invalid_fd_size); ATF_TC_BODY(nvlist_send_recv__invalid_fd_size, tc) { @@ -796,6 +851,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, nvlist_send_recv__send_many_fds__stream); ATF_TP_ADD_TC(tp, nvlist_send_recv__overflow_header_size); + ATF_TP_ADD_TC(tp, nvlist_send_recv__overflow_big_endian_size); + ATF_TP_ADD_TC(tp, nvlist_send_recv__overflow_little_endian_size); ATF_TP_ADD_TC(tp, nvlist_send_recv__invalid_fd_size); ATF_TP_ADD_TC(tp, nvlist_send_recv__overflow_fd_size); diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c index 73226ee51a78..11d9c9b49c94 100644 --- a/sys/contrib/libnv/nvlist.c +++ b/sys/contrib/libnv/nvlist.c @@ -1027,10 +1027,6 @@ static bool nvlist_check_header(struct nvlist_header *nvlhdrp) { - if (nvlhdrp->nvlh_size > SIZE_MAX - sizeof(*nvlhdrp)) { - ERRNO_SET(EINVAL); - return (false); - } if (nvlhdrp->nvlh_magic != NVLIST_HEADER_MAGIC) { ERRNO_SET(EINVAL); return (false); @@ -1050,6 +1046,11 @@ nvlist_check_header(struct nvlist_header *nvlhdrp) nvlhdrp->nvlh_descriptors = be64toh(nvlhdrp->nvlh_descriptors); } #endif + if (nvlhdrp->nvlh_size > SIZE_MAX - sizeof(*nvlhdrp)) { + ERRNO_SET(EINVAL); + return (false); + } + return (true); }