Commit 2456f44d authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Russell King

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

Commit c564df4d (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: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ddffeb8c
...@@ -45,10 +45,9 @@ int machine_kexec_prepare(struct kimage *image) ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment