From nobody Tue Apr 8 13:41:06 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 4ZX6fq2b6tz5sQB3; Tue, 08 Apr 2025 13:41:07 +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 4ZX6fp6Mwdz3DMX; Tue, 08 Apr 2025 13:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119666; 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=4/LOcGtD7DxOHH3eIkYEpeBbMHNUd9njEAzkid/AliM=; b=TS9nIOcldOwaaA4lEGzLE2wlyk5S4FPHSG3VGfuKFcYdVdWKcWvCNGY+TfFCI/DsGRy1jJ SCgExxFTF4TldBrbTJd89xZ/yqterBXQUDe5UNy41IzZelJO+5JTkBenWzl7hxLAcoWQDV ZOpUXQnRFMMQu/BnIgNaZxmrKFM7dse+CkckVgveOe+ZXyyjgBjKqLuENNF5hS3xmD4AAS ZwgPrEHn9wSZFzRTmhNv00W4vND5IN157/6lpE0JUpgdPJ3KO4Djw8o5K3eIdP/EVS0KjD D7VVRWYY14pLIGTCgze3DgzbsCdtnhac8rNNflQOo3CbYm0JDo7lpc+5lNDagA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119666; a=rsa-sha256; cv=none; b=pPS+xY/ivzPc34N5UwadkXwZCtfGdYN8jqpZPyK6fLCT5to9MG/6/VK5GwfxOZuZ5LUvZn OZhuhSvrYZe/ORTfaY3J0shlBMLUg1x/1VoP+/5QzMVACyl0C6Qp2vHQNUGaXGbADxTM16 iMe3Fcbcj1tdsR4ulg7R0jCPm9nj8vDzNimlpkxj8HOBJUlQD2ntwKWXFwtlr3dJQ3ZVab kXZriUaZtcgxIr4FoqkMvrvSsWJUZ95EFeQQTsgVs0rUnoi74XovDEG9mZJVIJhdeemY77 mRkEDUIlQKLlbgz0arNnscOl0OWrHlDefLhGcsIqHp4uPC5P3bOnJVpQCvb59A== 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=1744119666; 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=4/LOcGtD7DxOHH3eIkYEpeBbMHNUd9njEAzkid/AliM=; b=tTqjv42lmB++pqGzR6f4WbXP/e6KE5GXqEB/blzPwh/bs58POXB0aw41qRvyfmApBOdsWc VDWAo6HpdbCI4ax4t66514UuiYabF6Gza1tq4vw/7MF9Fx5l5R2Wh/yaDuDYRglhNF+6fh 8zcH6s0d9dejH3pkd6b3+8wwclI2dG9kRAUNJ1PA1bNYxLc3dyKa5FQlaejrDLcc3o0iqL lFCZAVkPEVLU+6KBlmGCL2JsOLDxX4R5dyPjkfB5KlyYNOdXQKbLuzc1VqeIT3UkgGhLCJ HPwUXriqY8up78uo8fyZWIRHB6tSL38/hZ8f4TroZp4qJ37Bf7e1xWtE6/PIxA== 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 4ZX6fp5jV5zZh1; Tue, 08 Apr 2025 13:41:06 +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 538Df6Le032571; Tue, 8 Apr 2025 13:41:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538Df6EK032568; Tue, 8 Apr 2025 13:41:06 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:06 GMT Message-Id: <202504081341.538Df6EK032568@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: 5feb3c8ea602 - stable/14 - libsa: smbios: Reject a 64-bit entry point with revision 0 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: 5feb3c8ea6025688944b2c402dee86fbc1878041 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5feb3c8ea6025688944b2c402dee86fbc1878041 commit 5feb3c8ea6025688944b2c402dee86fbc1878041 Author: Olivier Certner AuthorDate: 2025-03-07 13:32:24 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:27 +0000 libsa: smbios: Reject a 64-bit entry point with revision 0 According to the specification, such an entry point may have different data in bytes at offsets 0x0c to 0x17 (included). In such a case, interpreting them as the Structure Table Maximum Size and Address fields could have catastrophic consequences. Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49286 (cherry picked from commit 64fc51a9cf71b2308399b7b7dee8a9bc9468877b) --- stand/libsa/smbios.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 50cab3eee939..4deea4f31b11 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -193,6 +193,13 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) #ifdef SMBIOS_64BIT_EP /* v3.0, 64-bit Entry point */ if (strncmp(cp, SMBIOS3_SIG, sizeof(SMBIOS3_SIG) - 1) == 0 && + /* + * The specification only guarantees the presence of the + * Structure Table Maximum Size and Address Entry fields at + * offsets 0x0c and 0x10 if the Entry Point Revision is not + * 0. + */ + SMBIOS_GET8(cp, 0x0a) != 0 && smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0) { smbios.is_64bit_ep = 1; return (cp);