From nobody Wed Apr 29 14:50:10 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 4g5KwM55DRz6bkqY 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 4g5KwL5F7xz4KgX 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=IFxVYq32jgWPSsGCkHm3Gh0QtPx2n7+FdFolNK1D6fc=; b=a9tJzCEeFJx1PJ/F9Ytb/lCkYr+j8jD1mGMzKDRAJNkghcHXvN9XHk9Ek9FGaiKTaV/hxg /zeisR2Ttpps3MSDPytjmE5mL91jr6G7PwtL2dyL8BvEtezp5Z3kMMW7HVnqm40bjnaQ48 6lQagGxxZSFHzdBz1GWNPWbmC9o9AQWRfa/EPTumFG7KGKa/iSEeYJoFiwKfvSVRDTfb0i vn6fVu3y1uLrjYUSHppQLAusTxoVma6OhCosW8qzu8mL6HvGg3Do1jW8uucb+4TkZU6JGd 7q1maheMPcFmXgXBWce9rdJ4ORE9DAJ/2a6n1Wa+ARO4wvNLPOKD6TfWseQn8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474210; a=rsa-sha256; cv=none; b=mKvjUe891ltkbbTRyBcLFv8FdePXAxdHey4vuicc2Vr7uWVFKcSq/shFrtke6+8rPsUFDX C3KNseX6eid0Lw491Fds5MqRxmtmGbzV+Na71jIHHEjP/qM3A1xHsPKlNbutMKAsOcCN4+ 9LmW1Vd10OTLxiKDxeKBwv9k3kuWOr7cNcnBi1OlXn8xzSsAx9nJQfnNjWW4qB3J0dooEL XhJW9/wVogUneQ9xYJH9hExrntP60fkLGCeoUmPo2H6rhFXR/0vdAqema+xCY3yRRdPiFm Li0kg5ge/9lYkvS6zoM4c9PfncBbpTzHEAJra/P+KltcgDFY/8RoVxWxyGkb/w== 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=IFxVYq32jgWPSsGCkHm3Gh0QtPx2n7+FdFolNK1D6fc=; b=UDZdE9n7YuDjjtjGiS3tYYjiXQ66asrGtYC3CxoRfTX4tAKKSV3+mcQ2HiBK2gsYvV0Pf+ Og/zlzJD0LzLe+ivR3URTZVkQpyLEeG2JvgE9UepHNFSNh21YGVCDEnCsnjWcn6HKPf7Wa xQaL/cj6vMdNc1RMqPNvyOXH5yluHQznOZD3P+UoBdp0F6aJbVm8LYq54im3g8PQgQzzXM gtnu2BdC/DP2eKXnhFAv7uvVsD4qiP4E/G1X5KXhVqQ1aYebuSXjRqGZGHXkFqC5SpD7UZ g755ehHcTh/leXob9EOwY9RwuGL49+hcYm+N10RUD3mRmnZFVQOlLvLKvnTR0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5KwL2ypRzlYY for ; Wed, 29 Apr 2026 14:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ccf6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 14:50:10 +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: 05b91c2a7106 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 05b91c2a71061dd788d067283aa78275806a9e1e Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 14:50:10 +0000 Message-Id: <69f21aa2.3ccf6.3de850d8@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=05b91c2a71061dd788d067283aa78275806a9e1e commit 05b91c2a71061dd788d067283aa78275806a9e1e Author: Mariusz Zaborski AuthorDate: 2026-04-28 14:36:09 +0000 Commit: Mark Johnston CommitDate: 2026-04-28 20:31:04 +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); }