| Message ID | 1453279059-10967-1-git-send-email-purna.mandal@microchip.com |
|---|---|
| State | Accepted |
| Commit | 8d4f11c2033d0621f22a1501d92616596a8d1a62 |
| Delegated to: | Tom Rini |
| Headers | show |
On 20 January 2016 at 01:37, Purna Chandra Mandal <purna.mandal@microchip.com> wrote: > Variable _load_end_ points to end address of uncompressed buffer > (*not* uncomress_buffer_end / sizeof(ulong)), so multipling uncompressed > size with sizeof(ulong) is grossly incorrect in flush_cache(). > It might lead to access of address beyond valid memory range and hang the CPU. > > Tested on MIPS architecture by using compressed(gzip, lzma) > and uncompressed uImage. > > Signed-off-by: Purna Chandra Mandal <purna.mandal@microchip.com> > --- > > common/bootm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
Am Mittwoch, den 20.01.2016, 14:07 +0530 schrieb Purna Chandra Mandal: > Variable _load_end_ points to end address of uncompressed buffer > (*not* uncomress_buffer_end / sizeof(ulong)), so multipling > uncompressed > size with sizeof(ulong) is grossly incorrect in flush_cache(). > It might lead to access of address beyond valid memory range and hang > the CPU. > > Tested on MIPS architecture by using compressed(gzip, lzma) > and uncompressed uImage. > > Signed-off-by: Purna Chandra Mandal <purna.mandal@microchip.com> Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> > --- > > common/bootm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/common/bootm.c b/common/bootm.c > index 58936ca..99d574d 100644 > --- a/common/bootm.c > +++ b/common/bootm.c > @@ -435,7 +435,7 @@ static int bootm_load_os(bootm_headers_t *images, > unsigned long *load_end, > bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE); > return err; > } > - flush_cache(load, (*load_end - load) * sizeof(ulong)); > + flush_cache(load, *load_end - load); > > debug(" kernel loaded at 0x%08lx, end = 0x%08lx\n", load, > *load_end); > bootstage_mark(BOOTSTAGE_ID_KERNEL_LOADED);
On Wed, Jan 20, 2016 at 02:07:39PM +0530, Purna Chandra Mandal wrote: > Variable _load_end_ points to end address of uncompressed buffer > (*not* uncomress_buffer_end / sizeof(ulong)), so multipling uncompressed > size with sizeof(ulong) is grossly incorrect in flush_cache(). > It might lead to access of address beyond valid memory range and hang the CPU. > > Tested on MIPS architecture by using compressed(gzip, lzma) > and uncompressed uImage. > > Signed-off-by: Purna Chandra Mandal <purna.mandal@microchip.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Applied to u-boot/master, thanks!
diff --git a/common/bootm.c b/common/bootm.c index 58936ca..99d574d 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -435,7 +435,7 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end, bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE); return err; } - flush_cache(load, (*load_end - load) * sizeof(ulong)); + flush_cache(load, *load_end - load); debug(" kernel loaded at 0x%08lx, end = 0x%08lx\n", load, *load_end); bootstage_mark(BOOTSTAGE_ID_KERNEL_LOADED);
Variable _load_end_ points to end address of uncompressed buffer (*not* uncomress_buffer_end / sizeof(ulong)), so multipling uncompressed size with sizeof(ulong) is grossly incorrect in flush_cache(). It might lead to access of address beyond valid memory range and hang the CPU. Tested on MIPS architecture by using compressed(gzip, lzma) and uncompressed uImage. Signed-off-by: Purna Chandra Mandal <purna.mandal@microchip.com> --- common/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)