diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-10-21 11:34:34 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-12-06 12:16:41 -0700 |
| commit | b3fdb8fe9fe5480d4436a8ca49c76b93c2254a3d (patch) | |
| tree | 21068423917dc7f7db8e3380114c713f6aa2ac37 | |
| parent | 66f4a3644d0df3f96b26263e854cb4c47f30ea7d (diff) | |
OMAP4: avoid null pointer access in save_boot_params
When booting via spl the parameter layout is apparently different
and this leads to following bad pointers.
For now just work around the issue by checking pointers before
following them.
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S index 358107776..d5b2ed466 100644 --- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S +++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S @@ -66,7 +66,13 @@ ENTRY(save_boot_params) bgt 2f /* Store the boot mode (raw/FAT) in omap_bootmode */ ldr r2, [r0, #DEV_DESC_PTR_OFFSET] @ get the device descriptor ptr + bic r3, r2, #255 + cmp r3, #0 + beq 1f ldr r2, [r2, #DEV_DATA_PTR_OFFSET] @ get the pDeviceData ptr + bic r3, r2, #255 + cmp r3, #0 + beq 1f ldr r2, [r2, #BOOT_MODE_OFFSET] @ get the boot mode ldr r3, =omap_bootmode str r2, [r3] |