From nobody Fri Mar 07 16:44: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 4Z8XFS55fzz5pZ8j; Fri, 07 Mar 2025 16:44:44 +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 4Z8XFR4q99z44Dp; Fri, 07 Mar 2025 16:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741365883; 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=NiB0mAi79iRstxNezUTW2pEEsyfZIuRQBG0d3TxoBEQ=; b=L5he6nXc00/JaguIXOcYMinvHRosc4mWBCMcb4w1Ysh7uFu5bJzKCMIq+VVREsg0aCUka6 mSvPX4OiUqH0WTDcqNnxmTKPwCxe507Cd4wSmgN6lShCnvPKj77fxg8VPD8yJ1GDRzsNSx F1LByaA3H81C3VtI5SJm/JLNQGT/+6aFh+G9oDUnL/CbxPu1Ei1b84JDeIKXC9C+LSmjKH ssT/qc5G33vAobDSBJwOX4k2yMpc68gP2f2wqN4xk9N/Pe+jleYgenajrrmi1p9gwvoG1L hO93kehevye2wHduuDiLyST94Kt6xCRAgG0OlxHOrIr/DV51hLg+Yc5I5BfaBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741365883; a=rsa-sha256; cv=none; b=MeCsfpplkZUNBboLPYb9GjRf+Jfx7v3gXR3M+n4p+2GjOhkqBdDK/xvsQheJLxdH0DF7EU 0K0DXzxBJHNQs7CsltoKdTpaEO6EItJFlJXJ9a/dCmjyAGiyEuN06xc47m9mernw+Yh2qa xVR3vaUIBAmWOQZWPbS80vhUrrD/KxtoqB+VUbMfGW1czn1UEx3eBD1631ECybN7oWXaqS g8baSSF6siI/cdy1m7nOMr+PdtijjpGlNox6iGcSblbRr4wdw+3/NNgYv6JF3vKs7eNOas lMzf1Ni+CNFMt8OsV2MyBT0x0PZT83f1dSfVnfqd4E1mLrVguC9hKIv5m5pF8g== 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=1741365883; 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=NiB0mAi79iRstxNezUTW2pEEsyfZIuRQBG0d3TxoBEQ=; b=okcD7eSWCaYSC1WIALF+R+nKtOLW2NEoA7CFE4DRAUyFiD9w4DZ4N6lswnHj/KeHsRebb4 pM0qdtpPGpdE8vq8IbRk84Qb6CHlnTNkbP9ESXYiPEFMhS24KNMQPXhXl94z5fyFZ5+/iA m9DfVzMrGMjEL8x8QGn6jUlCwxbW1BisYJAnev6djXnLRwLUhI0pT6Tin9H48Io0FEXY84 Ll6CKPBJVpv+08/UGLx/PJdiXtCe8Tl+ASLYmLPWwhtvOj6xidOUNMphT063HJUJItUiiz HCg0EhQrRC4JGeMxyT1wCRwUhLF9NIL8T7Qay+cmW29TfoX/zXQBBYFXcIk+Pw== 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 4Z8XFR45nGzlWp; Fri, 07 Mar 2025 16:44: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 527GihXR052167; Fri, 7 Mar 2025 16:44:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 527Gih7X052164; Fri, 7 Mar 2025 16:44:43 GMT (envelope-from git) Date: Fri, 7 Mar 2025 16:44:43 GMT Message-Id: <202503071644.527Gih7X052164@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: bb04712e3772 - main - smbios: Carefully print wrong entry point signature on identify 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: bb04712e37723d112b2fad28af4b035ef35a25be Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bb04712e37723d112b2fad28af4b035ef35a25be commit bb04712e37723d112b2fad28af4b035ef35a25be Author: Olivier Certner AuthorDate: 2025-03-03 09:30:00 +0000 Commit: Olivier Certner CommitDate: 2025-03-07 16:42:46 +0000 smbios: Carefully print wrong entry point signature on identify Using printf() with '%s' can lead to arbitrary long printing (although, usually, a NUL byte should appear quite quickly) and trying to print unprintable characters. Instead, print in hexadecimal the exact bytes that are compared to the expected signature. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- sys/dev/smbios/smbios.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c index 67443d75c8fa..2cc8e3ff21c4 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -124,21 +124,13 @@ smbios_identify (driver_t *driver, device_t parent) if (map_size == sizeof(*eps3)) { eps3 = ptr; length = eps3->length; - if (memcmp(eps3->anchor_string, - SMBIOS3_SIG, SMBIOS3_LEN) != 0) { - printf("smbios3: corrupt sig %s found\n", - eps3->anchor_string); - goto unmap_return; - } + if (memcmp(eps3->anchor_string, SMBIOS3_SIG, SMBIOS3_LEN) != 0) + goto corrupt_sig; } else { eps = ptr; length = eps->length; - if (memcmp(eps->anchor_string, - SMBIOS_SIG, SMBIOS_LEN) != 0) { - printf("smbios: corrupt sig %s found\n", - eps->anchor_string); - goto unmap_return; - } + if (memcmp(eps->anchor_string, SMBIOS_SIG, SMBIOS_LEN) != 0) + goto corrupt_sig; } if (length != map_size) { /* @@ -167,6 +159,31 @@ smbios_identify (driver_t *driver, device_t parent) unmap_return: pmap_unmapbios(ptr, map_size); return; + +corrupt_sig: + { + const char *sig; + const char *table_ver_str; + size_t i, end; + + if (map_size == sizeof(*eps3)) { + sig = eps3->anchor_string; + table_ver_str = "64"; + end = SMBIOS3_LEN; + } else { + sig = eps->anchor_string; + table_ver_str = "32"; + end = SMBIOS_LEN; + } + + /* Space after ':' printed by the loop. */ + printf("smbios: %s-bit Entry Point: Corrupt signature (hex):", + table_ver_str); + for (i = 0; i < end; ++i) + printf(" %02hhx", sig[i]); + printf("\n"); + } + goto unmap_return; } static int