From nobody Wed Apr 29 14:50:10 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 4g5KwM5JDFz6bkqZ 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 4g5KwM1XhRz4KmL 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=1777474211; 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=KYj/FsHBAJpF0We4xnrP7lyhjwQdobrNAVyVhVcmT0lU8xY2j+vdM6OWPohA5RJZE+eaEd bxUDfB/wRuTkBKdI94fFBzBaNyaHFtv9E1c/F5ts8AMl2IB3PSEfyonOD8hOsjmQZ7CTaA EY2NMLtULf4VnFZujT9I9tEMv3FE9HlquNJvhyyGtdDxW9LDqay3QlYBcSeTL0CoZOTSdW ncb395Z1HtbhhBKJfzyJb9fOCfh4TwyHoSis3dbEJHy0cY5Wc+cwtWADDrnCHMySm8scDO AMOggv2A/H6le7kMWRKJ3H9LGqkp56WOn8cY3bu9WypbgKJUFtvTgN+q/A1S+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777474211; a=rsa-sha256; cv=none; b=Zn5wv7+ZdYNxcz5nP4xcAA75Zb/bCkQ3oLHAWPBB1iFDgbQMrTxxtk7XoaHbQ04IPulRQ9 1mjOxuehvN2DjFKxMi/sQRFB3qbfDkLj2kBPa01rIsqJolQJMLB3SmxCFx14yeQSWvEhKE Fjoc4IreVclYAKIHcM1sgwGYhFKsX3ew4ztuvthdSG47tnPzoWOiuimY9acG1WvsP8InU4 GvNwHc64ZXrFyanqoWv+hawHQFBMDejCoZRTsUegD9nwuZZ5+2zqHD++yLWQQaW002+QG1 ZFQtGpvMlkK1BoJkHbTIPtep2kLemvSEA+cddBRdd1NL5aUl8OAdukUZ3rS3FA== 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=1777474211; 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=qBICNxd1lucBvGU6L0D9fW85x7wcEr6kk+0qXdMBRwvOMuJjPn0wgdcGGz3xmUIr/Ynr8m 96tPg/kF31wopGI1p6cftt/CHDledSCEb5b93PYNlZLDPe577IJGL7Om/siL+zf5ko92vd wBM8LwpOwrW9hAsjpcUComWTo8GaQ7vmbUzK4igWpLGr9nBs7EBhkJ80pLPXMe6fhHOeVq rbNhRzHK474IvOKtMoLHNmZoCUvyf8+57S3k1kdru3VDkJ+m6RbmVmr9PQwON+dQ6UCqBy 9PyEy/al5xhWx7eLLSgpLY6zp3NXDk+3cxWosOIHliLzi+/wCOh859/Efi0WJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5KwL2yt1zlLP 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: 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/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); }