From nobody Thu Sep 19 13:30:45 2024 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 4X8bxd6gNfz5WcGr; Thu, 19 Sep 2024 13:30:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8bxd62Tnz46qP; Thu, 19 Sep 2024 13:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726752645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7IZWHVEjeniWcrmiX/l/pspOW7BY4TmokL8JAq1txx4=; b=T91jyCqn2c7l8JQxIuK49nU15kzUAx5xYbzjXiz0rJ5cvrNapZZsc4D0vTENKLdGceUkS9 2ZmoierTsxDcJOM9OstkU8oqOADopjn0naqlv9TjykzrWcYc+jNDBvcQbpngDPWpr6e+Do WKgxJFgSqbHcejDgv00MsThS1d0rv/0d/gWst/GotD0+fQzBu8c6f2jmrmOcEVWoN8Xz1j RvgTPH5BWamwC7u/fMNLLZCIC+URT1xlnjLzp2WwRTc2Pj5NvO8IK+aM5I8FoxcMG33uT5 aQqjvo6PT0iIUyJSTZ0nzfdhsE0t1Z0hcavNQIqZDxLZHQLS4zTPG4gqov/RZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726752645; a=rsa-sha256; cv=none; b=e9KbTdeyeP/UszxbVU6Me+mMmVZICp5XuW6+sVQExA+CSL0UU241DP6LdVJ63r+4BB6DoZ Vf8sNvg3XxHnlXyCXBpSik7dWGs8MJgHxUpswPt6rsa5a+PZjO681erJFbxUT2wcutHFgl LAw6w2SRtllNOxFova/AKFtw991IQx22AuQ1bX4mtD1MNfb6vRESPmyt6HQJ5zIOblmHC9 o8MxHIP/toN4pceeo4Lvs7J4kuiAckYdGJ+nuWneGgHGrHZBw/GTaR7W9e7Gkt2uFXMRPZ LgN3bJIOpU4KGNO5eXGAsY6zRqIrHPRfQLwAACRzTLx/N1bpu1SuCY4e+16mNQ== 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=1726752645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7IZWHVEjeniWcrmiX/l/pspOW7BY4TmokL8JAq1txx4=; b=U1Xk615L2IwztcHj8PzEVU3CJIwdPh1fOs7mxI6ABISfNfukmpkj0s+F+NKFBEyjlXw+kG t5q61I3MuCRTWG2dOnAJcEfgTUWkbo2NuLm4l7rNHaiaKztTv61/Bls5WfwFpKnuNAvXvD pCT01l3JEb/LLT1bNibK1hqE285epMlST1jaMVsVYHxt/7qXkXFiwA8rgCqtKTT3huXhR9 rR4PjMWB9dtqyyt85L6eMwpckd53ys0mTvUkDA5LfDqSvN1DzURPsXceWaGFJi/Ypwu6Uu Dz1xJHYBD9EqG5AEnq1BIAxml9mFB5+GTLssmSYNx0fCxZlMhMjYt3hWZYsWWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X8bxd5fY8z178Z; Thu, 19 Sep 2024 13:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48JDUjbE045786; Thu, 19 Sep 2024 13:30:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JDUj74045783; Thu, 19 Sep 2024 13:30:45 GMT (envelope-from git) Date: Thu, 19 Sep 2024 13:30:45 GMT Message-Id: <202409191330.48JDUj74045783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: e9d57be06e23 - releng/14.0 - libnv: correct the calculation of the structure's size 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: e9d57be06e23685c4f7e5045dd4959cb735f7dda Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=e9d57be06e23685c4f7e5045dd4959cb735f7dda commit e9d57be06e23685c4f7e5045dd4959cb735f7dda Author: Mariusz Zaborski AuthorDate: 2024-09-11 14:43:43 +0000 Commit: Gordon Tetlow CommitDate: 2024-09-19 13:11:22 +0000 libnv: correct the calculation of the structure's size Reported by: Milosz Kaniewski Approved by: so Security: FreeBSD-SA-24:16.libnv Security: CVE-2024-45287 (cherry picked from commit 7f4731ab67f1d3345aee6626eb83cc5ce00010f0) (cherry picked from commit 056c50c48be3e3828ef740d2fcce988a545e52aa) --- sys/contrib/libnv/nvlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c index 64078b10973e..92d6e655876a 100644 --- a/sys/contrib/libnv/nvlist.c +++ b/sys/contrib/libnv/nvlist.c @@ -1029,7 +1029,7 @@ static bool nvlist_check_header(struct nvlist_header *nvlhdrp) { - if (nvlhdrp->nvlh_size > SIZE_MAX - sizeof(nvlhdrp)) { + if (nvlhdrp->nvlh_size > SIZE_MAX - sizeof(*nvlhdrp)) { ERRNO_SET(EINVAL); return (false); }