Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: 7555/1: kexec: fix segment memory addresses check

Browse source 
Commit c564df4db8 (ARM: 7540/1: kexec:
Check segment memory addresses) added a safety check with accidentally
reversed condition, and broke kexec functionality on ARM. Fix this.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Aaro Koskinen 2012-10-16 19:35:14 +01:00 committed by Russell King
parent ddffeb8c4d
commit 2456f44dd7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/kernel/machine_kexec.c
View file

@ -45,10 +45,9 @@ int machine_kexec_prepare(struct kimage *image)
for (i = 0; i < image->nr_segments; i++) { for (i = 0; i < image->nr_segments; i++) {
current_segment = &image->segment[i]; current_segment = &image->segment[i];
err = memblock_is_region_memory(current_segment->mem, if (!memblock_is_region_memory(current_segment->mem,
current_segment->memsz); current_segment->memsz))
if (err) return -EINVAL;
return - EINVAL;
err = get_user(header, (__be32*)current_segment->buf); err = get_user(header, (__be32*)current_segment->buf);
if (err) if (err)