From nobody Tue Mar 11 14:04:43 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 4ZBwVz6RmLz5qbnc; Tue, 11 Mar 2025 14:04:43 +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 4ZBwVz3kQNz3qj2; Tue, 11 Mar 2025 14:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741701883; 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=GOEVHChGiESVxQ7MCpcL9nCbgq7BIFmuBmeF1fwg9Oo=; b=OfWzttoOlGCT4Mzu1q0Z4i4t2rHLEFbozOCpXINEUdZDCC7kyjUJy/zx84LAo+NuHYcHo7 kU82eGYH79y1/0ukA8TOBY1umB+2knz7kvdc8C7jCEEsMt9K9ov6HoQQcyrrvbwOXYLCPj tDtcQFwelI/TG85eD/jZyztJAQGhdvJjS/wV5SVFrwzH7EnGJVjxP6zDz5NiygKQgvkDKD SngjmGZxouTigRZtt3c5hqRIYdpNUsI5xdWKdZQv2KuKutWIIy2yLRuHHbhwXpZ7nGwH8u obinT66P0gQjHGkXT6Rl02MxhUYgJUVUsLdXidbywwxdLxQXnL/GMzHa1P7LSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741701883; a=rsa-sha256; cv=none; b=C8cuwZkBu9FtSlTzUgT2wd2X3NKrfPpbJYRq2ZDzcMzBMbezv6beYM1wLFGFXqYa+fPed/ 9ZQ2jcMDnrgV7fN+ucrxW0RAh8Cbt4HhGNt8USCvgLdGvN+P/yqLUdnRe2g54kBDJI6iif rlFBl1iLutHko2Jiml/hJhYfy8P0NR1B3RDN546v174gkiaHTvlMHKQbJwE2LJpHMRXSBk g1Q7r9bSE9H39wbl3kKFJon1HIU3E5cWfhbCbf99g3QlL0NiEr6c1VN2fdV0DkCex8bLP7 tHXA8ZjbtUWLXzM0U+nNRHoiegChQ3x8fPLIR9JddYCf42z/A51XwU0SdMOmRw== 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=1741701883; 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=GOEVHChGiESVxQ7MCpcL9nCbgq7BIFmuBmeF1fwg9Oo=; b=I2l7CHVd5iCSIIJ2V/10+dpQSXlZ6cFu4EXvgLOgH9pTEhWwPT3rKgiZcsPUOHmysag0zy uRjf7WU83QfUzKL1PM/zBqxMCxLhL5xbWYRBjK2gGmyjn3Ug+X+e+1F2GMPNb19PWF14vp TEcQl51u9fvQ23O5C/h2Tyr2eQcPpmmisOWQHDoxQg3KK5RnagrUPUgMyg8HIsoC4tYSZ/ 1qex5/8t0NRMNmqzzQdv5mi9O+2FKfsaVsXMDM5J5PoY5QIEl+NhN5I0O3eKNKmFBmxy32 miAxMDPBO+K1LYDqG+5K1YBLoqByqHoq45481PzBbfzLjiNLvGCEEH6cP7cqJg== 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 4ZBwVz2gNLzD3d; Tue, 11 Mar 2025 14:04:43 +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 52BE4hPb028803; Tue, 11 Mar 2025 14:04:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BE4hD4028800; Tue, 11 Mar 2025 14:04:43 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:04:43 GMT Message-Id: <202503111404.52BE4hD4028800@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: 64fc51a9cf71 - main - libsa: smbios: Reject a 64-bit entry point with revision 0 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: 64fc51a9cf71b2308399b7b7dee8a9bc9468877b Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=64fc51a9cf71b2308399b7b7dee8a9bc9468877b commit 64fc51a9cf71b2308399b7b7dee8a9bc9468877b Author: Olivier Certner AuthorDate: 2025-03-07 13:32:24 +0000 Commit: Olivier Certner CommitDate: 2025-03-11 13:54:09 +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 --- 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);