From nobody Tue Apr 08 13:40:51 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 4ZX6fW6NRDz5sQLF; Tue, 08 Apr 2025 13:40:51 +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 4ZX6fW1Knkz3Cmp; Tue, 08 Apr 2025 13:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119651; 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=V7JmyRtwKHfFVc8rtHMqudaG0dPIsj3aY+st/cr+oao=; b=yYR8bZhfyyomlgqOy/hRl/Z3W079h88PTORLdXzOU2UyWORPSV98cfm56vEkJmJhoDVenS 2PhZpWH6J7zfnnPakIHldJ4hKXVoemoZOpLilIiUPh5ZE1ffp73rOHU85yghEXXl/GgQBz YMYyD/UGN/zhLpwFkzaTs2h3dT/FsWueNh3SVjjoQJ5RgVivQA/RPdRXX6fQyA+hrG++Wz gZ3xaIFRFdegCRxQzELjuqYuloNqEbEasJ9lJpBRF6O7oef+LZPEYz14bZeylC/OiTcGky p+Bc4fKUj0IAo5cwDYfbxb8zexzTNTvQphxoHvMhNQlIktBp/U0+zoWyw78Z8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119651; a=rsa-sha256; cv=none; b=uBe1+IlSx3dD3HYuyg6soXTcs3gkxhZk/clGIR4o9xe/goaQqwdIOjzpIR8LoPxetYwL55 C+D6aFKShVG259NRoO70hk3N1FCE5FXdnA7Y2zVNJIiG7Hrv8OACgtpfeGUgdQVAdsU4My LfUtn7wDwWW5TdH18kCDLVxedve5XmjXoLgEkWCrYqc9cjOoxfoDVV5yLMaMPwZ+J5blvW m32BzGgUA3DrEQXciyOePGos6kWqgTFeh2YDSJIOmXDkLnfDIR5rbHP19otqX71wO/yf/G 5DuOQXAb9FiA7XalnsIgRdh7bDMArtBWokjtT1zsQ6MO2dP+M5Nr//y5D9ZHVQ== 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=1744119651; 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=V7JmyRtwKHfFVc8rtHMqudaG0dPIsj3aY+st/cr+oao=; b=U7wYTSwvFOKS0QMHk6Fz7tKl9nkl6WEvBhz+kmzyjqDTbdBzIe1JLmwq7a6MnW98KShy86 yuVeSd6NuDve/udyWyT2IgUoM9FuIcZjeVw2IZRcbr3qzJ4YDe6M2jEmYtBMnF5u37/VgG +9wg++5X7iMdiQPrvuWY592mQLjRcz86vtskhSGlVOluBR9tUCvhVPhX3aVpbeg7HObbHj WI68dcdlCLUWOIu+w5ED4R/FLTy/lXTYosaYVszuE7GfOwAhmjXwMhhLnhoYkSDmxFECB3 4RZH+TT/mlidICwkQrqj7FPJlHImYvWDyQNvKv59QEoq8Ze5UCqWdeMLmdaJIg== 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 4ZX6fW0tQWzZgv; Tue, 08 Apr 2025 13:40:51 +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 538DepAA032063; Tue, 8 Apr 2025 13:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538Depl2032058; Tue, 8 Apr 2025 13:40:51 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:40:51 GMT Message-Id: <202504081340.538Depl2032058@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: 07b84d1f3f14 - stable/14 - smbios: Unmap memory on error 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: 07b84d1f3f14782edf0817bb2a0793e4e08c2007 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=07b84d1f3f14782edf0817bb2a0793e4e08c2007 commit 07b84d1f3f14782edf0817bb2a0793e4e08c2007 Author: Olivier Certner AuthorDate: 2025-02-28 17:19:37 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:23 +0000 smbios: Unmap memory on error on identify While here, de-indent most of the code by simply bailing out if 'addr' is still 0 after the various detection methods have been tried. Reviewed by: emaste, imp MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49180 (cherry picked from commit 67d510f0c07afd89e51e337e5abec47f4483ecd9) --- sys/dev/smbios/smbios.c | 82 ++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c index e10ffa192e2b..cd9a0eefb9f9 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -114,53 +114,53 @@ smbios_identify (driver_t *driver, device_t parent) } #endif - if (addr != 0) { - ptr = pmap_mapbios(addr, map_size); - if (ptr == NULL) - return; - 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); - return; - } - } 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); - return; - } + if (addr == 0) + return; + + ptr = pmap_mapbios(addr, map_size); + if (ptr == NULL) + return; + 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 (length != map_size) { - u_int8_t major, minor; - - major = eps->major_version; - minor = eps->minor_version; - - /* SMBIOS v2.1 implementation might use 0x1e. */ - if (length == 0x1e && major == 2 && minor == 1) { - length = 0x1f; - } else { - pmap_unmapbios(eps, map_size); - return; - } + } 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 (length != map_size) { + u_int8_t major, minor; - child = BUS_ADD_CHILD(parent, 5, "smbios", -1); - device_set_driver(child, driver); + major = eps->major_version; + minor = eps->minor_version; - /* smuggle the phys addr into probe and attach */ - bus_set_resource(child, SYS_RES_MEMORY, 0, addr, length); - device_set_desc(child, "System Management BIOS"); - pmap_unmapbios(ptr, map_size); + /* SMBIOS v2.1 implementation might use 0x1e. */ + if (length == 0x1e && major == 2 && minor == 1) + length = 0x1f; + else + goto unmap_return; } + child = BUS_ADD_CHILD(parent, 5, "smbios", -1); + device_set_driver(child, driver); + + /* smuggle the phys addr into probe and attach */ + bus_set_resource(child, SYS_RES_MEMORY, 0, addr, length); + device_set_desc(child, "System Management BIOS"); + +unmap_return: + pmap_unmapbios(ptr, map_size); return; }