mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: "Uwe Kleine-König" <uwe@kleine-koenig.org>,
	"Ahmad Fatoum" <a.fatoum@pengutronix.de>
Subject: [PATCH 1/6] fastboot: terminate request for non-file-backed partition properly
Date: Mon, 28 Apr 2025 14:52:13 +0200	[thread overview]
Message-ID: <20250428125217.1931365-2-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20250428125217.1931365-1-a.fatoum@pengutronix.de>

If addition of fastboot variables fail due to a specific partition, it's
not enough to log a warning at the barebox side, but we need to return
an error to the client too, otherwise it will hang indefinitely.

Fixes: 6a191155be4e ("fastboot: evaluate fastboot partitions when used")
Reported-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/fastboot.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/fastboot.c b/common/fastboot.c
index 34ac00bb0ecf..5a43bfb7e596 100644
--- a/common/fastboot.c
+++ b/common/fastboot.c
@@ -298,8 +298,12 @@ static void cb_getvar(struct fastboot *fb, const char *cmd)
 
 		ret = fastboot_add_partition_variables(fb, &partition_list, fentry);
 		if (ret) {
-			pr_warn("Failed to add partition variables: %pe", ERR_PTR(ret));
-			return;
+			char *msg = xasprintf("%s: Failed to add '%s' partition variables: %pe",
+					      fentry->name, fentry->filename, ERR_PTR(ret));
+			pr_warn("%s\n", msg);
+			fastboot_tx_print(fb, FASTBOOT_MSG_FAIL, "%s", msg);
+			free(msg);
+			goto out;
 		}
 	}
 
-- 
2.39.5




  reply	other threads:[~2025-04-28 13:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-28 12:52 [PATCH 0/6] fastboot: fix handling of non-existent partitions Ahmad Fatoum
2025-04-28 12:52 ` Ahmad Fatoum [this message]
2025-04-28 12:52 ` [PATCH 2/6] fastboot: introduce fastboot_tx_print_var() helper Ahmad Fatoum
2025-04-28 12:52 ` [PATCH 3/6] fastboot: don't populate partition variables unconditionally Ahmad Fatoum
2025-04-28 12:52 ` [PATCH 4/6] fastboot: only populate variables explicitly asked for Ahmad Fatoum
2025-04-28 12:52 ` [PATCH 5/6] fastboot: factor out fb_file_getsize Ahmad Fatoum
2025-04-28 12:52 ` [PATCH 6/6] fastboot: check for file existence before flashing/erasing Ahmad Fatoum

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250428125217.1931365-2-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=uwe@kleine-koenig.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox