ARM: poison_init_mem: fixed underflow in loop
PATCH 1/1 ARM: poison_init_mem: fixed underflow in loop
When initmemory ends at an odd address, the loop variable in poison_init_mem() will underflow which causes overriding of valid memory. Such situations are not a theoretical issue only but exist in practice:
| [ 0.000000] .init : 0xc0634000 - 0xc0c215ab (6070 kB)
Patch makes a simple division instead of DIV_ROUND_UP() because latter can override some bytes after .init.
--- arch/arm/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mm/init.c +2 -1
@@ -449,7 +449,8 @@ static inline int free_area(unsigned long pfn, unsigned long end, char *s)static inline void poison_init_mem (void *s,size_t count) {u32 *p = (u32 *)s; -for (; count !=0 ; count -=4 ) + count /=sizeof (*p); +for (; count !=0 ; count--) *p++ =0xe7fddef0 ; }
Signature · 1 line
1.8.1.2
PATCH 1/1 ARM: poison_init_mem: fixed underflow in loop
Quoted 20 lines · Enrico Scholz
When initmemory ends at an odd address, the loop variable in
poison_init_mem()will underflow which causes overriding of valid memory. Such situations are not a theoretical issue only but exist in practice:| [ 0.000000] .init :
0xc0634000-0xc0c215ab(6070 kB)Patch makes a simple division instead of
DIV_ROUND_UP()because latter can override some bytes after .init.Signed-off-by Enrico Scholz <[email protected]>--- arch/arm/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/arm/mm/init.c +0
-0
arch/arm/mm/init.c static inline int free_area(unsigned long pfn, unsigned long end, char *s) · line 456
Quoted 9 lines
arch/arm/mm/init.c +2
-1@@ -449,7 +449,8 @@ static inline int free_area(unsigned long pfn, unsigned long end, char *s)static inline void poison_init_mem (void *s,size_t count) {u32 *p = (u32 *)s; -for (; count !=0 ; count -=4 ) + count /=sizeof (*p); +for (; count !=0 ; count--) *p++ =0xe7fddef0 ; }
Sigh. I really screwed that up badly. I wonder if we should instead PAGE_ALIGN() the end address similar to what we're doing for the initrd and then put a BUG_ON() inside poison_init_mem() that catches none page aligned sizes.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation