From nobody Fri Mar 07 16:44:44 2025 X-Original-To: dev-commits-src-main@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 4Z8XFT1WNwz5pZjb; Fri, 07 Mar 2025 16:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8XFS5pYBz44KH; Fri, 07 Mar 2025 16:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741365884; 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=yeWe0F4EB/7CNKsxHAcJ2dEvZpapJaQkoJmG5KPwCFc=; b=VlZLG4g7HRDxAIoUPzQJcTrKgc2Lj7GEA8l3cIXBWeD3OtcFpW/5kAWf5Je3CPU3ftFnR6 3YhyS0mCk69YNo4nKNL5Fis3OJW4m6pEF9IAINbntMrWn3iCnxSQ6cj+PIvEytQBdNC2iH aI2+l6m4weKwSRylfOsWhm4JK7QnxdVqHHW/W9TgErwa40cGdd5/UWDv6KEcVr7hn5k8R3 RAnbMz4QSh4lXqzvGaxfW30CzPzS2eBWS1USjtBtTXnSwDcsb4r1enpYfz5kiPd75/W7+b y1KL4c2W5CASZJrqSpVYmN69Ee/7soq22NmVVWsKZ102IlnVw7/bepmMMqdKtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741365884; a=rsa-sha256; cv=none; b=H2EDNvhjasnKLdKkIQk3ZHYFIL6dPpXbrh9ySeLseuj0YogiuTRbnBXV5rioA2xm7XlrkS Y6NKTUrjEweSIrSbSOC3JLCBn5PEsT17vXStxd7f5Yxq5VcMXP5BeuAKVYZnjiYtiHqV+x /FtyzP6c8yww7TEDwejbFwTF7oOPGbUc1+6AjSHiMXnD0hdEhJ1O6M37Ptnl6J7TQ0z/21 TxniizuYKMRor+MqxejqnZ9MCnk4o2Ed8YjeizgO44JW+NA+Bs83UAwBvk4Np5YToUIHjU t0hCtPWqvVGaE5BEj7v1iJ76vop+8jQznlwYZo4as+DK3ZSBCrINIr5lY/UpRQ== 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=1741365884; 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=yeWe0F4EB/7CNKsxHAcJ2dEvZpapJaQkoJmG5KPwCFc=; b=BMYKXI5MyGvKA9dsJPHYGw2n1WPJMvaDmse9XK7/AhBNAXvQ+CekQ1Cr0mofmkqPmoOsn9 XfI/8zUcGgNm71KM1cQrzZqKz83e3bBC2mzbJLxi+lq9T9QRJTfQfGEejGj0kBsR9g7gQR N7YsI0RYa+2twO0jnCpVIbVZSd+k4SB5Ba8b0QYtaKbq8ToSVdejBMaWk3rSW6116zYQC7 Ai6g2VzUL8toBZ8iiRj9wFDBf7JLxb+GE+Vf2dCyv+DkDvKqswSgwv33Frlc+XM68hB8jb CPWAyQw5OW1zT0gkmPVfZN/a5kCZSAr3zEs3qEVhH/tOZkElpnAx6kA+jhm5QA== 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 4Z8XFS555TzlZb; Fri, 07 Mar 2025 16:44:44 +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 527GiiWa052200; Fri, 7 Mar 2025 16:44:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 527Gii7m052197; Fri, 7 Mar 2025 16:44:44 GMT (envelope-from git) Date: Fri, 7 Mar 2025 16:44:44 GMT Message-Id: <202503071644.527Gii7m052197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 516e24e57987 - main - smbios: Harden decoding of the BCD revision List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 516e24e57987d184cce70e7f31443653aa1a5e63 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=516e24e57987d184cce70e7f31443653aa1a5e63 commit 516e24e57987d184cce70e7f31443653aa1a5e63 Author: Olivier Certner AuthorDate: 2025-03-03 14:25:23 +0000 Commit: Olivier Certner CommitDate: 2025-03-07 16:42:46 +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 --- 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 2cc8e3ff21c4..ca329c0f65f6 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -241,18 +241,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); }