mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org, lgo@pengutronix.de
Subject: Re: [PATCH] fastboot: inform user if barebox update falls back to raw copy
Date: Thu, 9 Jun 2022 09:19:28 +0200	[thread overview]
Message-ID: <20220609071928.GY1615@pengutronix.de> (raw)
In-Reply-To: <20220531093537.1731712-1-a.fatoum@pengutronix.de>

On Tue, May 31, 2022 at 11:35:37AM +0200, Ahmad Fatoum wrote:
> Fastboot code determines whether to go into barebox update handler by
> checking whether filetype_is_barebox_image() returns true for the image.
> This is different from the barebox_update command which leaves it to the
> individual handlers to decide whether an image is suitable.
> 
> Coupled with eMMC boot partitions, this could lead to
> `barebox_update -t mmc` updating the boot partition, while a
> `fastboot flash bbu-mmc` will write the image to the user area instead.
> 
> It may be worth breaking backwards compatibility here and refuse update
> in that case, but for now at least alert the user that a raw copy is
> being attempted.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  common/fastboot.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/common/fastboot.c b/common/fastboot.c
> index f8ed40c86e00..50ea8421d92c 100644
> --- a/common/fastboot.c
> +++ b/common/fastboot.c
> @@ -673,7 +673,7 @@ static void cb_flash(struct fastboot *fb, const char *cmd)
>  		goto out;
>  	}
>  
> -	if (IS_ENABLED(CONFIG_BAREBOX_UPDATE) && filetype_is_barebox_image(filetype)) {
> +	if (IS_ENABLED(CONFIG_BAREBOX_UPDATE)) {


>  		void *buf;
>  		struct bbu_handler *handler;
>  		struct bbu_data data = {
> @@ -681,6 +681,17 @@ static void cb_flash(struct fastboot *fb, const char *cmd)
>  			.flags = BBU_FLAG_YES,
>  		};
>  
> +		if (!filetype_is_barebox_image(filetype)) {
> +			if (strstarts(fentry->name, "bbu-")) {
> +				fastboot_tx_print(fb, FASTBOOT_MSG_INFO,
> +						  "This is _not_ a barebox image...");
> +				fastboot_tx_print(fb, FASTBOOT_MSG_INFO,
> +						  "Falling back to raw copy to %s", filename);
> +			}
> +
> +			goto copy;
> +		}

The handlers starting with "bbu-" are registered from the barebox update
code, so falling back to copy is clearly wrong.

The logic to enter this barebox_update path should be:

	if (IS_ENABLED(CONFIG_BAREBOX_UPDATE) &&
	    (filetype_is_barebox_image(filetype) || strstarts(fentry->name, "bbu-")))

That way we are sure that barebox_update is called when we need it. Also
behaviour is consistent to what barebox_update does on the command line.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  parent reply	other threads:[~2022-06-09  7:21 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-31  9:35 Ahmad Fatoum
2022-06-09  6:05 ` Ahmad Fatoum
2022-06-09  7:19 ` Sascha Hauer [this message]
2022-06-09  8:21   ` Ahmad Fatoum
2022-06-09  8:33     ` Sascha Hauer

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=20220609071928.GY1615@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=lgo@pengutronix.de \
    --subject='Re: [PATCH] fastboot: inform user if barebox update falls back to raw copy' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox