| Message ID | 20190220103612.2421-1-narmstrong@baylibre.com |
|---|---|
| State | Accepted |
| Commit | f402d268e8e17e9d6d1d9bf8a8b1f6e0b07718ef |
| Delegated to: | Lukasz Majewski |
| Headers | show |
| Series | [U-Boot] fastboot: common: fix default fastboot_boot on 64-bit | expand |
On Wed, 20 Feb 2019 at 03:36, Neil Armstrong <narmstrong@baylibre.com> wrote: > > When booting on a 64-bit system, the boot_addr_start buffer is not > large enough to contain a 64-bit number, thus leading to a crash > even if fastboot_buf_addr is valid, only the high part of the address > will be printed to boot_addr_start : > > fastboot with fastboot_buf_addr = 0x0000000006000000: > downloading of 92239872 bytes finished > Booting kernel at 0x00000000... > > "Synchronous Abort" handler, esr 0x96000004 > elr: 00000000010561f4 lr : 0000000001056fac (reloc) > <snip> > x28: 000000007df2d38f x29: 000000007df2d1b0 > > Resetting CPU ... > > With this fix, boot_addr_start can have the full 64-bit address passed > to bootm. > > Fixes: f73a7df984a9 ("net: fastboot: Merge AOSP UDP fastboot") > Cc: Simon Glass <sjg@chromium.org> > Cc: Alex Kiernan <alex.kiernan@gmail.com> > Cc: Sam Protsenko <semen.protsenko@linaro.org> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/fastboot/fb_common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index c6e06aab7a..17eca73be0 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -119,7 +119,7 @@ void fastboot_boot(void) if (s) { run_command(s, CMD_FLAG_ENV); } else { - static char boot_addr_start[12]; + static char boot_addr_start[20]; static char *const bootm_args[] = { "bootm", boot_addr_start, NULL };
When booting on a 64-bit system, the boot_addr_start buffer is not large enough to contain a 64-bit number, thus leading to a crash even if fastboot_buf_addr is valid, only the high part of the address will be printed to boot_addr_start : fastboot with fastboot_buf_addr = 0x0000000006000000: downloading of 92239872 bytes finished Booting kernel at 0x00000000... "Synchronous Abort" handler, esr 0x96000004 elr: 00000000010561f4 lr : 0000000001056fac (reloc) <snip> x28: 000000007df2d38f x29: 000000007df2d1b0 Resetting CPU ... With this fix, boot_addr_start can have the full 64-bit address passed to bootm. Fixes: f73a7df984a9 ("net: fastboot: Merge AOSP UDP fastboot") Cc: Simon Glass <sjg@chromium.org> Cc: Alex Kiernan <alex.kiernan@gmail.com> Cc: Sam Protsenko <semen.protsenko@linaro.org> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/fastboot/fb_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)