From nobody Tue Apr 8 13:40:54 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 4ZX6fb1vjbz5sQ5H; 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 4ZX6fZ54WXz3CwH; Tue, 08 Apr 2025 13:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119654; 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=I9NP2loG+ciAX+lSJJ0SFXWWrMkfBOc4zEiX6DN8TXU=; b=CsYxTzgwwr7XGEgF7ASoy+UYHH0HdAn82sqqbX6fEw87TIpTBfUfpgaV3YLjfUIVphFykl wQIYCnvJb/R6yGtUchW/8Us+0RHlJAO4u9mypf4wuZrVA1aLSdtDayj6dxHuCDALEJ9dHa YWcNr1V1Bzt7VC3IBcy17+FDLTLWdgsOXePOtnoBdjDgIqdvUlRMQdcreERV7DIRWnRAKf ZwdCsXsqvaxT6KBora4dkiDWBcq3HBeakBPtX4cawQJ5l7JVpO3KCNJ2NbM9U+R1iai0Aa 5kGaxjc2pVxW6e9zGmoQe3d0H8C7R/5s8qcPj3II0miZRwTKSRkGIRoUK8t/Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119654; a=rsa-sha256; cv=none; b=dWQoBpoun8X3jGWNb/wKjGWcxy0AP8Dq5jvgXb3CQz0w0JuZVO47RI6fAle4L0Ak40WDWc VgWdCdhJ8+1ysBX3DsHclpV7LewB9R3sz/EvyoyG6fozz6CaJGLLSq3MSDdWHxyRIzTHQT uZ39aSgu4znluQ4afz5xyBFQkjLe8PrTWxXACUAN9V+UE+iHNF6le12MVF7Sp3yrcypQAb jOlw3traeto3KhznM7gpVVBsI8VI6E3lJYGYgg0AjbkdhmByZXX77XWRWQQTTqAHeV1SGZ DyZGukm4DHT6xHmeXRNKQaAsRc0qFECxwNdTL7gpyVhUBwDw4Oh+HH2FUxaaVw== 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=1744119654; 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=I9NP2loG+ciAX+lSJJ0SFXWWrMkfBOc4zEiX6DN8TXU=; b=AaUjYXIJU8jMESf2vN6mbMEZsceaXO1xmZDKRNu1pREirsMVRmSJ8N3fgajgqQop+m4MmG S1JZi/4UirrG5RfsJ7TKVWk0KzJl9IufuIKZmdsLI6aqsVVijuobemqFD41QThFmZvLDbY MyVivkGRYvep9zry3w4CWHl7pjpRyUCNWudMEyNOF2JMzfaW0Nne7chz84W4hEhjq0t9vS R6Q2mLGByFebcmARYp4j22UgbiDe3nyWGDgil4zBXchS+rhVkdNKFZJ449nyHNe62fStvZ hOxQXoUfra0m3pDQTP0WgeZ2J9TFxbF+Ir0igl45ceSN8qiJ3NDlGzgGVn6WUQ== 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 4ZX6fZ38Ftzb7y; Tue, 08 Apr 2025 13:40:54 +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 538Desw4032172; Tue, 8 Apr 2025 13:40:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538Des9I032169; Tue, 8 Apr 2025 13:40:54 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:40:54 GMT Message-Id: <202504081340.538Des9I032169@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: 7dffa9db4516 - stable/14 - smbios: Print an error on unexpected entry point length 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: 7dffa9db45169e5e54d6fa6024733a5e6740a5a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7dffa9db45169e5e54d6fa6024733a5e6740a5a2 commit 7dffa9db45169e5e54d6fa6024733a5e6740a5a2 Author: Olivier Certner AuthorDate: 2025-03-03 10:12:33 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:24 +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 (cherry picked from commit fdf08ac1e9f9baac4fcf4af8f3bf7a34d3ea0009) --- 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 f2c1dffad033..4a5305ea80c0 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -87,7 +87,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; @@ -149,8 +149,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", -1);