From nobody Wed Apr 29 14:50:22 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 4g5Kwb0NDgz6bknM 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 4g5KwZ531Mz4LBZ 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=/llWnCvNg2hCO3G+EincmATm6mJzWDcBZWb4M2caaa8=; b=NqJ84WMXZsbjlt0vfCeUq3kAC172jojigWeoeP8jGWX4J6rKuykoiBDR5HcbHWFMH5s/NA lom9ow2ZBD8/JDRxjk2D/t0Z3j5OtofhFeVf8vQi/DEFYgLcKYIIomyyejHW4nUY32i4mm 8jZXAXyKk0/lkR2JvLoqa39lojkcQGOsVKmVsWums21BaySBqAR+mh2kqK6lHdVXMYSMo1 a1u1XDXDS0MGcEoVLcX3knUDFDQjiajGJpzGyZuGeMHyTdWydSRCw+4yCmDRvdyajl5s1r gepRUic2LyoyXkn0KW5n8llODAcRjLS3dbzObceR/C0MDVpPFyL0dPcPxPSbKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474222; a=rsa-sha256; cv=none; b=DnszRppRff4C7giamIDLkqKgHypYgDD+kl8wO71rnB7fj1S6NESonNCgP+0Y6oEVqx3hwc W2p/vEtg2wQ9Y9wqcfw9kvumFJOy+nBZS5hm/jY/wSKY9OorZ1GjSHpsbJ9tKc0KsHDNKq qBcyjJz2sN1Zt/ia8yksj20uycAwvl93E2xQ0T/HP34TK7A580nx7eR8EX2e+sB4AZfKD0 /jVAiIEVgPIc4okcoHbZTXPBUbfVqZ1dGxI7/tRCLkq7v1c0YsMyQZHK6wiWOTqghjaySv +AiXpO/uOgXoxhPuUIwurHJpXQBSIQV/pA3MXcEKISEfqCR8p4TIH3c2NbXZ1A== 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=/llWnCvNg2hCO3G+EincmATm6mJzWDcBZWb4M2caaa8=; b=ZXK1NnPFgzGVYAGL7VSuTGHURzneRNb+KR43eLV1pDz5XZ0Zw7XJt92kVEVDUfNexfwWFo q60zt64kB8FgPwOX0fITpv/ZpshnA6zi4JebT1S/v4zo/ogPWppUNdxyHCJfus5u5qMzoy DR/UyMKgbpTlTq+xKkh2z6xiLmL0Y79rFE5VwGdKHLa6Fu5RTUjm2rJ6rjsNUXKuSxFkrH U6l4goL80tqIvpnQDFw7j4+v8XMwnO4tNAn0AaSLFMZbOfeiJPac96VCMONW7iNLy3YNAL z3/DzvJm/+HX4bqRqJDA7DXDbJkYtSdAmJuai0ZN8u70DKtdtTKXz8/+fxfFiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5KwZ4dwPzlfM for ; Wed, 29 Apr 2026 14:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc32 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 14:50:22 +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: f7f48005fbe2 - releng/13.5 - 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/releng/13.5 X-Git-Reftype: branch X-Git-Commit: f7f48005fbe256e3af42db3cc5ad33b140050f03 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 14:50:22 +0000 Message-Id: <69f21aae.3cc32.723d129a@gitrepo.freebsd.org> The branch releng/13.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f7f48005fbe256e3af42db3cc5ad33b140050f03 commit f7f48005fbe256e3af42db3cc5ad33b140050f03 Author: Mariusz Zaborski AuthorDate: 2026-04-28 14:36:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-28 20:32:11 +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 --- sys/contrib/libnv/nvlist.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c index 6934da0df00a..721332247b38 100644 --- a/sys/contrib/libnv/nvlist.c +++ b/sys/contrib/libnv/nvlist.c @@ -1029,10 +1029,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); @@ -1052,6 +1048,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); }