From nobody Tue Apr 8 13:40:56 2025 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 4ZX6fd0QfTz5sQNm; Tue, 08 Apr 2025 13:40:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZX6fc5fKLz3Cwf; Tue, 08 Apr 2025 13:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119656; 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=NpLs4Epg7h6ZVvhgvOs/q56/Fxw/oM+7LKIszDQ12kQ=; b=b671MokW7fxB459wffVQCdiT5+O0SfYarfeUXuHVNc45aJO+zZXKC0uNRiyeOl3MizDooo qSURdtTIKOY11fyKk+HoC1gcW6UxvNsvJDoed5/dAI/OPCCTG84NEX8y+khp+sZ2cfWzJl 5MClpUULAL9ctyi2JIkae8GDgMQATId7rnFFivqL/tmY9KExkFgdxcw0GTHNyxLABUtapC IXXrWfhgMKzwUpF9BLMNSPsxs3F08VXPaHh/vw6SQTYw1XaD/Wda5lXgd8wtkUSXUndgvf H6I05GzrU5kVdY/ZjXoqNrecnhSaGYOMwB1lYOFpyZzBr8hpEADYvGZRHP5nyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119656; a=rsa-sha256; cv=none; b=igvWKZW+JHXcgitZqZZs7vylPoi119oi1Hu9m8E9Vxuz1tyc/OoTTTG7Vmd5kRSKnHE8RD Z+yGjWxc/Idex64DPZZW+cd4BG84huBOpGsmi/PXAtUSPf6ZMfgdpyX7Kh0S1eP1qrZ7yV K4Hi3OItdUQUwT0FXtJ1hIOJoAe6RDtxlyAvmJ/2U+guX9WUzr+2cjMTuz0UzHVSoELePV LLJBEqkax58Oe+xZIR3z2vVqscDT4zueIqghppTjwFQDwtUWXgHNKH6sfOFW3s26BgffZ2 ubmWZCcWJMMEp4L25b41gD+8qr3OP41PgRJSRjJuOuaqm4woOeiWh/mtaOxx2g== 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=1744119656; 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=NpLs4Epg7h6ZVvhgvOs/q56/Fxw/oM+7LKIszDQ12kQ=; b=m4hQE/h8juZ/O19oxtYOOE9C6JZB+EzT0x050p27FEWdXzaFG6BB2ptD0iM1SvrJEu5Zp8 cGjJM82heiT5SfdCOutN5CMDDqY8ytilB9Zy8dx+NHZZjNyRf2m812otcNFy0MJSN0o/6j Vu/BR5MK741ikuio0DC7oQX0AMa2KgRYHXMMcMlL4raaZD0DApMAYQ8hQw7MN7VvEr7ps9 UEuSQEAvTCqduphk4yuM6su25W0K39jUBROJQyRid7+Embq5yppJSIeCJ5m4vfGHGK/scg zLSvoYxNkOq8KpADiiq3FJUWB5LT2JUc3AVmOyuNxEJvLgLFFLj5fHtZtgSS2A== 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 4ZX6fc58wBzZrX; Tue, 08 Apr 2025 13:40:56 +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 538DeuGD032244; Tue, 8 Apr 2025 13:40:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DeuJO032241; Tue, 8 Apr 2025 13:40:56 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:40:56 GMT Message-Id: <202504081340.538DeuJO032241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 55e8cdff1443 - stable/14 - smbios: Harden decoding of the BCD revision 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55e8cdff14435ddb056440b3d962eded453d2b22 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=55e8cdff14435ddb056440b3d962eded453d2b22 commit 55e8cdff14435ddb056440b3d962eded453d2b22 Author: Olivier Certner AuthorDate: 2025-03-03 14:25:23 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:25 +0000 smbios: Harden decoding of the BCD revision bcd2bin() must not be called with a value greater or equal to LIBKERN_LEN_BCD2BIN. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit 516e24e57987d184cce70e7f31443653aa1a5e63) --- sys/dev/smbios/smbios.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c index c8536d5f86c5..24e110f722d3 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -242,18 +242,20 @@ smbios_attach (device_t dev) "Docrev: %u, Entry Point Revision: %u\n", sc->eps3->docrev, sc->eps3->entry_point_revision); } else { + const struct smbios_eps *const eps = va; + const uint8_t bcd = eps->BCD_revision; + sc->eps = va; device_printf(dev, "Entry point: v2.1 (32-bit), Version: %u.%u", - sc->eps->major_version, sc->eps->minor_version); - if (bcd2bin(sc->eps->BCD_revision)) + eps->major_version, eps->minor_version); + if (bcd < LIBKERN_LEN_BCD2BIN && bcd2bin(bcd) != 0) printf(", BCD Revision: %u.%u\n", - bcd2bin(sc->eps->BCD_revision >> 4), - bcd2bin(sc->eps->BCD_revision & 0x0f)); + bcd2bin(bcd >> 4), bcd2bin(bcd & 0x0f)); else printf("\n"); if (bootverbose) device_printf(dev, "Entry Point Revision: %u\n", - sc->eps->entry_point_revision); + eps->entry_point_revision); } return (0); }