From nobody Fri Mar 07 16:44:42 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 4Z8XFR2WCnz5pZJZ; Fri, 07 Mar 2025 16:44: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 4Z8XFQ3PV4z44JZ; Fri, 07 Mar 2025 16:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741365882; 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=RpLkw2z78qJVuAKS1Gt1l9Y9kcr2zMbLhMxN4QHTgEc=; b=nJP7XzHUK9BfZSG3M4yRslLQVl/IiQakIeD3/alPO6ksQ3Ic31H49Ulaz2UyBFnBL2v3a7 ZLioM2NQRI/763aq64ZesGNN4Sb15MAEPjnVuepeFJ9JQ8ZRExIgJMFYuCLS8+hp6uCplJ a+/GLaLx66t7OBAVd+xCklC/qQxfLuWfOZjrFYcFajk4KOCGIgSXcw3F+mgMZaUIK8WBg2 mVg+kXmSdzUgHwmuV8OnRptejbCqiYi8D3wR5OVMnJYudC8l9YX8ccDr+CdGjmGTUw8YWf VsQ09kR9YKnvEBzUGUdP4qXmKcAmfV0M/4NYqnTWwUTgib6MN824cEffxPQGcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741365882; a=rsa-sha256; cv=none; b=AQAqPgkSo1nTXb+FrStytmjCm2ujlypsAk2lXIwWjN7yLgK3KbhmAWbnGRMoAIsTE4Oqwr Mnv69/ZbjiTBZdyYTBR01HQEn4t3xtoNv3gzkGhUd754jnd0IHMtOuz/bOokrIE9vUaTFa aQrWyyszOvJqdPOF3BAuH884mvdoscD17kkStCay6eyvir8WsFAzKl0CJbuJm2bf05CwEe iZOHgDbYbSCRLdPGvkM/clJNCpe6icFOXaqyj1QzvjcA62TpnMBTlsukbuuU3D3E7pK94B NfhGfwMRCuOziPnDOCv7vMEUdd7tvRWzl5xObyPRx12iVjxeL2qyZ9KoOyTMJA== 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=1741365882; 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=RpLkw2z78qJVuAKS1Gt1l9Y9kcr2zMbLhMxN4QHTgEc=; b=XpDQQNRf93dDNjIrj7+FAkkNUZM0p2+BlO+kKnnun21N0VO31kynfwyoXDnT4gg3+HekFq gghjU7gDBLBFOz0y0TIKr6HjZ+Ue6qRIaJUwM8yt9d4XtdYEPwsbrjdWq7mJjZCblgvBOt L6e93/4bXFM58io1tO+mxV4OoQV27hRsCXFS4HuiHteTZXM7+vAkKo2b6VYDV10V+c1Cyz QnMadmJCj9PK5Yge7V7JupJsCfn4O/yGjUkRYHHkgLY/2vuTjAu6cj1EfpaUmNgtorcqiM fDY26BmsURgZHF5SxzGfKaRw25dFTjs8d65u9gDXhB/f+rkTUVnrTRYrBwtpvg== 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 4Z8XFQ2tLQzlWn; Fri, 07 Mar 2025 16:44:42 +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 527Gig87052134; Fri, 7 Mar 2025 16:44:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 527Gig1E052131; Fri, 7 Mar 2025 16:44:42 GMT (envelope-from git) Date: Fri, 7 Mar 2025 16:44:42 GMT Message-Id: <202503071644.527Gig1E052131@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: fdf08ac1e9f9 - main - smbios: Print an error on unexpected entry point length 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: fdf08ac1e9f9baac4fcf4af8f3bf7a34d3ea0009 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fdf08ac1e9f9baac4fcf4af8f3bf7a34d3ea0009 commit fdf08ac1e9f9baac4fcf4af8f3bf7a34d3ea0009 Author: Olivier Certner AuthorDate: 2025-03-03 10:12:33 +0000 Commit: Olivier Certner CommitDate: 2025-03-07 16:42:46 +0000 smbios: Print an error on unexpected entry point length on identify This helps figuring out quickly why no SMBIOS device appears in this case. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- sys/dev/smbios/smbios.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c index 733384b3614e..67443d75c8fa 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -86,7 +86,7 @@ smbios_identify (driver_t *driver, device_t parent) device_t child; vm_paddr_t addr = 0; size_t map_size = sizeof(*eps); - int length; + uint8_t length; if (!device_is_alive(parent)) return; @@ -148,8 +148,13 @@ smbios_identify (driver_t *driver, device_t parent) if (length == 0x1e && map_size == sizeof(*eps) && eps->major_version == 2 && eps->minor_version == 1) length = map_size; - else + else { + printf("smbios: %s-bit Entry Point: Invalid length: " + "Got %hhu, expected %zu\n", + map_size == sizeof(*eps3) ? "64" : "32", + length, map_size); goto unmap_return; + } } child = BUS_ADD_CHILD(parent, 5, "smbios", DEVICE_UNIT_ANY);