From nobody Tue Apr 16 20:13:36 2024
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 4VJwGT1KHsz5H0g4;
Tue, 16 Apr 2024 20:13:37 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4VJwGS6d9lz4vlp;
Tue, 16 Apr 2024 20:13:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1713298416;
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=4Sgu2BAHRJHmMRSiutNQhNpzpSWr9bcvo5lxtQfufaM=;
b=NlwSW2CBT8v8pxKHUQQefC8z209hBxceqVe7C6DKxclgA5LrkXKseF08nGbqQjgLUazO34
WkGWhLP8U8P/n+Gog1BiNHqR4xlbDcljHDfNH4EMIEvxWN1rnYQUDTwxzgmTYKkcnAMBEj
/Xv6pfYqCxe+ezUz2o17u0f/W60yCRomL03XtdRFSpfy27wx8fQs04sg4HFWA78hORIdsA
n+SMCk8HX2+N1bkJj1H4xjGJmSBdVuTTiatNgNzXah49wwuRO3Bd4vdXIhW9RMuaP/MQ/e
vDRlMRDuCDbnJzsm+DZRWnDvppKh5bn2/ygn5Bs4SBZy8wxYSYJNgmwFZbzVqw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298416; a=rsa-sha256; cv=none;
b=ESapeYr5eDJw88CQNz6Xbrmi1FbXBedbEnHz1YeOARVKpP8qly5wpkUK1WS1UWzG8PPpYo
odNxY2c45JsNOXP3LAm6LVMI0Evso/oNkEvQxm1fAxVfd+YhIWD5nVhpluYZkyJnVvZS4I
FiSHZDaqasgk7WdJuTsYjbnNYajzmxAdESncpn03eaBTxKHNIjgWQQ32+X+3G9Pnn2PLo+
tJItvpC6YR18rmS2Otpdf/Hp0glNVWi7DSUmb1Sc6kEPilVUNJ5FUB1UD/4dgoifuhc0/7
XaE/o1ZNwUw98i+yI4+t89YeB8hvjBnNwowprhpZteI5EjlYfO4m7wIVjQsSjw==
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=1713298416;
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=4Sgu2BAHRJHmMRSiutNQhNpzpSWr9bcvo5lxtQfufaM=;
b=aDWB8rLV2A8LX7hdu5SOrFKmS0ZRO2vd/LUcEPcadabE4NOSrcc71pCHnfe4llMgn26wsM
Rv5+bxO8KowRQxN3AhgQIPjmcVkYRHnSYMlf23jKU9dpB2ELXG5J2UpDSuNE5O8f8ARd/6
+ETnEoaAONKqfvBbK2OJ9/Fz3oOrweyppEVLpmQ8dIU8Gq7yOpa5yagY5p8XZMOJJue4we
oNDh+03+NwYhPTPlVg2OtjpuOQ0wtyRG1WDSFSjhfBjBj948uDgfkzTjFHvmNVxdN0lntH
zP8hwbSEpNk00c1w/r0W52KnwvP6wy+vdl+hMQGzCudfOhPEWLdQ9v4Sb6Cduw==
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 4VJwGS6D6JzxY8;
Tue, 16 Apr 2024 20:13:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKDakE040009;
Tue, 16 Apr 2024 20:13:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDaWU040006;
Tue, 16 Apr 2024 20:13:36 GMT
(envelope-from git)
Date: Tue, 16 Apr 2024 20:13:36 GMT
Message-Id: <202404162013.43GKDaWU040006@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: d55ddce0c8e9 - stable/14 - kboot: kbootfdt: fix error
handling
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: imp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: d55ddce0c8e957c5285d28a5bfdbf3774c04bc56
Auto-Submitted: auto-generated
The branch stable/14 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=d55ddce0c8e957c5285d28a5bfdbf3774c04bc56
commit d55ddce0c8e957c5285d28a5bfdbf3774c04bc56
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-03-11 20:15:44 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-04-16 19:54:29 +0000
kboot: kbootfdt: fix error handling
If we are able to open /sys/firmware/fdt, but aren't able to read it,
fall back to /proc/device-tree. Remove comment that's not really true,
it turns out.
Sponsored by: Netflix
(cherry picked from commit 462af7676b3ee8a8bd9ee9b55a35c0cf815a351f)
---
stand/kboot/kboot/kbootfdt.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/stand/kboot/kboot/kbootfdt.c b/stand/kboot/kboot/kbootfdt.c
index 70844820d345..e4c378423585 100644
--- a/stand/kboot/kboot/kbootfdt.c
+++ b/stand/kboot/kboot/kbootfdt.c
@@ -91,22 +91,21 @@ fdt_platform_load_dtb(void)
{
void *buffer;
size_t buflen = 409600;
- int fd;
+ int fd, err = 0;
/*
* Should load /sys/firmware/fdt if it exists, otherwise we walk the
* tree from /proc/device-tree. The former is much easier than the
* latter and also the newer interface. But as long as we support the
- * PS3 boot, we'll need the latter due to that kernel's age. It likely
- * would be better to script the decision between the two, but that
- * turns out to be tricky...
+ * PS3 boot, we'll need the latter due to that kernel's age.
*/
buffer = malloc(buflen);
fd = host_open("/sys/firmware/fdt", O_RDONLY, 0);
- if (fd != -1) {
- buflen = host_read(fd, buffer, buflen);
+ if (fd >= 0) {
+ err = host_read(fd, buffer, buflen);
close(fd);
- } else {
+ }
+ if (fd < 0 || err < 0) {
fdt_create_empty_tree(buffer, buflen);
add_node_to_fdt(buffer, "/proc/device-tree",
fdt_path_offset(buffer, "/"));