From nobody Tue Apr 08 13:41:12 2025 X-Original-To: dev-commits-src-all@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 4ZX6fx4XNPz5sQ7c; Tue, 08 Apr 2025 13:41:13 +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 4ZX6fw3bRZz3DSZ; Tue, 08 Apr 2025 13:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119672; 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=Ed2PiQ6QPwcUxhqzNFDRzMrxp3R047Hgl86S5VNlm/w=; b=vPZY7tEehrVMOKqJZF925ySGszLbQxSqVFwsAmmSJwgrUUBwrrVZ3d9ZpeV6LxZdjmBQlA Xq7tNqritYxADcvapHX5+yTI4uIH5zacCgK2lu3XRiFJeZJu1HSKsxQFYARpRPtlHkH2Rn LdFiAljDWwhfVysXF9MSiYf+t/4I+0x13fD9tfj6xbkX6nF98sjMWC5FTdiXUjY8sM2HkL 5naDU0Lq8SIt1ZVxdpM9fqesL1m/VP/hptwCti6i5v7tOz1Z5fZRHWu0r8wvnn4umlEIY9 SWMJCIEEAkCbjUejMNRx0WLJ8hJvTEjuewjGHMBaVOAPwyTmUMGmIxZEHyafFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119672; a=rsa-sha256; cv=none; b=q2Np4Q9S9exJcSqaxTZf06s8c/BjyeZkolhs6EuEwtkoWSnjryUhjQ9qtIJLeY1JiUZ7c0 unEB7ey5ZBTpUCcwhgBBcRWP72NRb4atAtMrvGPeTrBA/RLBptmpUxdLLNPiWWBkydK7dW Q4405eLCB7UnBw61II4nDVuZ93VZMe1Op7XwbLigY9skhZpXZsi9m5G9qbV1SgWwlK/xm7 XuZ+f6aWlpcUjzqTsRamUepMgJPrzKgS0Puq4oygUfu+9kA+/FY6clH+Dpjm8vEXJkHaKl 8MVRSPCFAMI0Jg2ctsqcgaOeVuv+yeMprJm57ohXYOjJjtqZNpE36tFXhl4/IA== 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=1744119672; 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=Ed2PiQ6QPwcUxhqzNFDRzMrxp3R047Hgl86S5VNlm/w=; b=gygt8yjBH8UOlLGeWwKzDXX9RUmJBGkopDqyJzg1qmAZ8z5tKzkoxkZvbkWX+FrLH4cMxY PUteeA62c3bRKsxIrzjalrnwl58XcvGHyyD701YUhFB8IIN+6Xt7oQE1tz4JftT5U1JC0Q LSQIfpWN8A5Ibdw5LFv7vqqvIgLkhMhqo+r9ndOAHrCJ2kjho8IPWCnIkcD4UeDmFa0Mwm A5reaiBsrqDna82GQyeqoGWJ8NBo6Ihu07x1oPyuQsudsUnGOImPcNkD9uXeuxWtf5s55F za64v6b6il4rAkaJv4pcz+51pTDuFWDScfPRH9uYFr9H5dsMQOBRID9D0gDyzw== 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 4ZX6fw33glzb6C; Tue, 08 Apr 2025 13:41:12 +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 538DfC8x034543; Tue, 8 Apr 2025 13:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DfCPm034540; Tue, 8 Apr 2025 13:41:12 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:12 GMT Message-Id: <202504081341.538DfCPm034540@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: f6b90dc8afc0 - stable/14 - libsa: smbios_probe(): Strictly obey specified entry point address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f6b90dc8afc0666a6a7e012d38ec02eb1d5b771f Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f6b90dc8afc0666a6a7e012d38ec02eb1d5b771f commit f6b90dc8afc0666a6a7e012d38ec02eb1d5b771f Author: Olivier Certner AuthorDate: 2025-03-05 10:34:49 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:28 +0000 libsa: smbios_probe(): Strictly obey specified entry point address When such an address is known, do not search elsewhere, contrary to what we are doing on non-EFI boot (see SMBIOS_START and SMBIOS_LENGTH). Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49291 (cherry picked from commit 1ee8714950b8d07ccd172f2bcbbbaa91f02ef9e7) --- stand/libsa/smbios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 54cfac58b19e..618c8a1052ec 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -573,8 +573,8 @@ smbios_probe(const caddr_t addr) int min_off; /* Search signatures and validate checksums. */ - saddr = smbios_sigsearch(addr ? addr : PTOV(SMBIOS_START), - SMBIOS_LENGTH); + saddr = addr != NULL ? smbios_sigsearch(addr, 1) : + smbios_sigsearch(PTOV(SMBIOS_START), SMBIOS_LENGTH); if (saddr == NULL) return;