diff mbox

[U-Boot,v2] arm: bugfix: save_boot_params_default accesses uninitalized stack when -O0

Message ID 4FEC4195.1020400@kmckk.co.jp
State Superseded
Headers show

Commit Message

Tetsuyuki Kobayashi June 28, 2012, 11:35 a.m. UTC
save_boot_params_default() in cpu.c accesses uninitialized stack area
when it compiled with -O0 (not optimized).

Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
---
Changes for v2:
 - include <linux/compiler.h> and use __naked instead of __attribute__((naked))


 arch/arm/cpu/armv7/cpu.c |    4 ++++
 1 file changed, 4 insertions(+)

-- 1.7.9.5

Comments

Tom Rini June 28, 2012, 2:57 p.m. UTC | #1
On 06/28/2012 04:35 AM, Tetsuyuki Kobayashi wrote:
> save_boot_params_default() in cpu.c accesses uninitialized stack area
> when it compiled with -O0 (not optimized).
> 
> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
> ---
> Changes for v2:
>  - include <linux/compiler.h> and use __naked instead of __attribute__((naked))
> 
> 
>  arch/arm/cpu/armv7/cpu.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
> index c6fa8ef..3e2a75c 100644
> --- a/arch/arm/cpu/armv7/cpu.c
> +++ b/arch/arm/cpu/armv7/cpu.c
> @@ -36,9 +36,13 @@
>  #include <asm/system.h>
>  #include <asm/cache.h>
>  #include <asm/armv7.h>
> +#include <linux/compiler.h>
>  
> +__naked /* don't save anything to stack even if compiled with -O0 */
>  void save_boot_params_default(u32 r0, u32 r1, u32 r2, u32 r3)

The usual form (here and kernel) is:
void __naked save_boot_params_default(...)

Same for __weak and so on.  Thanks!
Tetsuyuki Kobayashi June 28, 2012, 4 p.m. UTC | #2
On 2012/06/28, at 23:57, Tom Rini wrote:

> On 06/28/2012 04:35 AM, Tetsuyuki Kobayashi wrote:
>> save_boot_params_default() in cpu.c accesses uninitialized stack area
>> when it compiled with -O0 (not optimized).
>> 
>> Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
>> ---
>> Changes for v2:
>> - include <linux/compiler.h> and use __naked instead of __attribute__((naked))
>> 
>> 
>> arch/arm/cpu/armv7/cpu.c |    4 ++++
>> 1 file changed, 4 insertions(+)
>> 
>> diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
>> index c6fa8ef..3e2a75c 100644
>> --- a/arch/arm/cpu/armv7/cpu.c
>> +++ b/arch/arm/cpu/armv7/cpu.c
>> @@ -36,9 +36,13 @@
>> #include <asm/system.h>
>> #include <asm/cache.h>
>> #include <asm/armv7.h>
>> +#include <linux/compiler.h>
>> 
>> +__naked /* don't save anything to stack even if compiled with -O0 */
>> void save_boot_params_default(u32 r0, u32 r1, u32 r2, u32 r3)
> 
> The usual form (here and kernel) is:
> void __naked save_boot_params_default(...)
> 
> Same for __weak and so on.  Thanks!
> 
Oh, I should grep __naked before posting this.
I will try V3.
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
index c6fa8ef..3e2a75c 100644
--- a/arch/arm/cpu/armv7/cpu.c
+++ b/arch/arm/cpu/armv7/cpu.c
@@ -36,9 +36,13 @@ 
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/armv7.h>
+#include <linux/compiler.h>
 
+__naked /* don't save anything to stack even if compiled with -O0 */
 void save_boot_params_default(u32 r0, u32 r1, u32 r2, u32 r3)
 {
+	/* stack is not yet initialized */
+	asm("bx lr");
 }
 
 void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3)