From nobody Tue Apr 08 13:40:55 2025 X-Original-To: dev-commits-src-branches@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 4ZX6fb5vHsz5sQ77; Tue, 08 Apr 2025 13:40:55 +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 4ZX6fb4vkxz3DBj; Tue, 08 Apr 2025 13:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119655; 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=8FbJXhvXAkW7SAPrMK+zIcNWilFoNz9cE+mj70Q8MhM=; b=APq0iONATRN5fwn2JvgQVoUzryrs2ouUegUb0Xq08xsDKm+1z6Rv0bDgQGn5z9+3eiRHE7 VAwePAOECnwtjogox3PemX+tLN3v9DjGysuvrN75ycEcak7g76rBkNLIVmVmq3rKtP7k4C qlXCgBaWJPo5xxcAdWWiR3KqUOMKmD2ciwJjXmjVrVhQe3x2lO7f3Z51esP0HHMKMLK5IE rGBNngyCikJO2IVzGg0xHDFZdMxFo3vp6hL0z14LCainU6Bo9tkgh3/YDH4k/P55zYzgCp YiUgGl4jjjrB7bSxncGCNmgpH5bpuC55xOP8wJAX+4FwmWHJP4GIuvokSdyptg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119655; a=rsa-sha256; cv=none; b=b92wClPahmO2ASw5BWEt2b6cVErkO3I1qtf8/PeIn8VS1yxtLnlKkrYsKxkwynVMSJ4bUm b+VQHc341iD5lBWD5w2RzzpGmMyg7OJGz3IBSQmmA+ahWlbmWJKfn6qVGOkMhF4d9c306k ZTejlCEd/2SCHgOfCDj4tIsUwosz10xLBP+na+ri/J2ipjgiuOH0v0jfpS+UPYDDyrbAkn we6KjiARQi3HORfCW/ztkRYeX7QoSsOEXekaoDECDLFXvikirXXbC2o2FwXum+Hc05Mor4 gxRjg0bgZQnnuyA1uEF5AfNVIash2wEFJ7RRbnMkl+LOI/OEJ6xIiy+7FVBiHA== 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=1744119655; 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=8FbJXhvXAkW7SAPrMK+zIcNWilFoNz9cE+mj70Q8MhM=; b=YX4saqGzrj49s2k/HoSBySRpV7HrteAasM50RSupv1toxllvOxIi5v3j13Z/zXVnSl2vNW L1vNEK+iItrN9+Dt+UuvUBXq0INtf2/qeboXOLI05Qk6Iu/fZJt46CzYKsUH9WxhOpYo0U 6c/q3vi+Lkd7IdOiaAfDcXyYVnG0Z0lLl4wfY76PXrHRsoD1p/muZvwjZmEdDXZo3/H595 TjNHgjLXEIzJoq64dJfy62Uq9RQiiCUoqDm0N3uHHWjY5+/X4A8MIh9wx1gRFW7UD/+ekk sDypPJpqv1CU7qnbbSuEweGqmR16ipOhyba/4q1qpn7lsD5H/2srLJi9Tya/HQ== 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 4ZX6fb48PtzZrW; Tue, 08 Apr 2025 13:40:55 +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 538DetZf032209; Tue, 8 Apr 2025 13:40:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DetL3032206; Tue, 8 Apr 2025 13:40:55 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:40:55 GMT Message-Id: <202504081340.538DetL3032206@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: 5d9f1bf830db - stable/14 - smbios: Carefully print wrong entry point signature on identify List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 5d9f1bf830dbd02f565cedc29f2663bd13565e8c Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5d9f1bf830dbd02f565cedc29f2663bd13565e8c commit 5d9f1bf830dbd02f565cedc29f2663bd13565e8c Author: Olivier Certner AuthorDate: 2025-03-03 09:30:00 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:24 +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 (cherry picked from commit bb04712e37723d112b2fad28af4b035ef35a25be) --- 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 4a5305ea80c0..c8536d5f86c5 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -125,21 +125,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) { /* @@ -168,6 +160,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