[U-Boot] [PATCH] SPL: fat: Fix spl_parse_image_header() return value handling
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com --- common/spl/spl_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 338ea2f..5b0d969 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -58,7 +58,7 @@ int spl_load_image_fat(struct blk_desc *block_dev, goto end;
err = spl_parse_image_header(header); - if (err <= 0) + if (err) goto end;
err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0);
On Thu, May 19, 2016 at 8:45 PM, Marek Vasut marex@denx.de wrote:
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com
Reviewed-by: Fabio Estevam fabio.estevam@nxp.com
On Fri, May 20, 2016 at 01:45:24AM +0200, Marek Vasut wrote:
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com
Reviewed-by: Peng Fan van.freenix@gmail.com
Regards, Peng.
common/spl/spl_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 338ea2f..5b0d969 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -58,7 +58,7 @@ int spl_load_image_fat(struct blk_desc *block_dev, goto end;
err = spl_parse_image_header(header);
- if (err <= 0)
if (err) goto end;
err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0);
-- 2.7.0
On 20/05/2016 01:45, Marek Vasut wrote:
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com
common/spl/spl_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 338ea2f..5b0d969 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -58,7 +58,7 @@ int spl_load_image_fat(struct blk_desc *block_dev, goto end;
err = spl_parse_image_header(header);
- if (err <= 0)
if (err) goto end;
err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0);
Reviewed-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
On Fri, May 20, 2016 at 01:45:24AM +0200, Marek Vasut wrote:
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com
Reviewed-by: Tom Rini trini@konsulko.com
Hello Marek,
Am 20.05.2016 um 01:45 schrieb Marek Vasut:
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com Reviewed-by: Fabio Estevam fabio.estevam@nxp.com Reviewed-by: Peng Fan van.freenix@gmail.com Reviewed-by: Stefano Babic sbabic@denx.de Reviewed-by: Tom Rini trini@konsulko.com
common/spl/spl_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks!
So: Reviewed-by: Heiko Schocher hs@denx.de Tested-by: Heiko Schocher hs@denx.de
bye, Heiko
On Fri, May 20, 2016 at 01:45:24AM +0200, Marek Vasut wrote:
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com Reviewed-by: Fabio Estevam fabio.estevam@nxp.com Reviewed-by: Peng Fan van.freenix@gmail.com Reviewed-by: Stefano Babic sbabic@denx.de Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Hi Tom,
On Mon, May 23, 2016 at 7:14 PM, Tom Rini trini@konsulko.com wrote:
On Fri, May 20, 2016 at 01:45:24AM +0200, Marek Vasut wrote:
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com Reviewed-by: Fabio Estevam fabio.estevam@nxp.com Reviewed-by: Peng Fan van.freenix@gmail.com Reviewed-by: Stefano Babic sbabic@denx.de Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Looks like something went wrong while applying this patch as Marek's authorship got lost:
commit d550e82e4efebf5995809e38e8fb029b8fe6e861 Author: Tom Rini trini@konsulko.com Date: Mon May 23 11:51:13 2016 -0400
SPL: fat: Fix spl_parse_image_header() return value handling
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Reviewed-by: Fabio Estevam fabio.estevam@nxp.com Reviewed-by: Peng Fan van.freenix@gmail.com Reviewed-by: Stefano Babic sbabic@denx.de Reviewed-by: Tom Rini trini@konsulko.com
On 06/17/2016 05:01 PM, Fabio Estevam wrote:
Hi Tom,
On Mon, May 23, 2016 at 7:14 PM, Tom Rini trini@konsulko.com wrote:
On Fri, May 20, 2016 at 01:45:24AM +0200, Marek Vasut wrote:
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com Reviewed-by: Fabio Estevam fabio.estevam@nxp.com Reviewed-by: Peng Fan van.freenix@gmail.com Reviewed-by: Stefano Babic sbabic@denx.de Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Looks like something went wrong while applying this patch as Marek's authorship got lost:
Ah, you're right, nice catch :)
Tom, I don't really care, bug is fixed, you can leave it as it is.
commit d550e82e4efebf5995809e38e8fb029b8fe6e861 Author: Tom Rini trini@konsulko.com Date: Mon May 23 11:51:13 2016 -0400
SPL: fat: Fix spl_parse_image_header() return value handling The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error. Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Peng Fan <van.freenix@gmail.com> Reviewed-by: Stefano Babic <sbabic@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
On Fri, Jun 17, 2016 at 05:06:05PM +0200, Marek Vasut wrote:
On 06/17/2016 05:01 PM, Fabio Estevam wrote:
Hi Tom,
On Mon, May 23, 2016 at 7:14 PM, Tom Rini trini@konsulko.com wrote:
On Fri, May 20, 2016 at 01:45:24AM +0200, Marek Vasut wrote:
The spl_parse_image_header() can return 0 and it is not an error. Only treat non-zero return value as an error.
Signed-off-by: Marek Vasut marex@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Peng Fan van.freenix@gmail.com Cc: Stefano Babic sbabic@denx.de Cc: Tom Rini trini@konsulko.com Reviewed-by: Fabio Estevam fabio.estevam@nxp.com Reviewed-by: Peng Fan van.freenix@gmail.com Reviewed-by: Stefano Babic sbabic@denx.de Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Looks like something went wrong while applying this patch as Marek's authorship got lost:
Ah, you're right, nice catch :)
Tom, I don't really care, bug is fixed, you can leave it as it is.
Ug! Sorry about that, I really don't know how that happened either.
participants (6)
-
Fabio Estevam -
Heiko Schocher -
Marek Vasut -
Peng Fan -
Stefano Babic -
Tom Rini