[PATCH] fastboot: sparse: print descriptive error on overflowing destination

Bastian Krause bst at pengutronix.de
Mon Dec 11 01:39:57 PST 2023


On 12/8/23 15:06, Ahmad Fatoum wrote:
> Fastboot flash of both regular files and barebox update handlers will
> print a message if the file being written doesn't fit the destination:
> 
>    barebox update:  "Image (%zd) is too big for device (%lld)\n"
>    fastboot:        "write: No space left on device\n"
> 
> With sparse images however, not the write will fail, but the lseek to
> the new offset, triggering a cryptic:
> 
>    "writing sparse image: Invalid argument"
> 
> Let's improve upon this a bit by translating lseek -EINVAL to -ENOSPC,
> so we get:
> 
>    "writing sparse image: No space left on device"
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>

Tested-by: Bastian Krause <bst at pengutronix.de>

Thanks!

Bastian

> ---
>   common/fastboot.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/fastboot.c b/common/fastboot.c
> index 65d1d30f9092..261283d50a3a 100644
> --- a/common/fastboot.c
> +++ b/common/fastboot.c
> @@ -598,7 +598,7 @@ static int fastboot_handle_sparse(struct fastboot *fb,
>   
>   			pos = lseek(fd, pos, SEEK_SET);
>   			if (pos == -1) {
> -				ret = -errno;
> +				ret = errno == EINVAL ? -ENOSPC : -errno;
>   				goto out;
>   			}
>   

-- 
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 |




More information about the barebox mailing list