diff options
| author | Matthew Leach <matthew.leach@arm.com> | 2012-09-21 18:56:11 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-26 22:58:39 +0100 |
| commit | c564df4db85aac8d1d65a56176a0a25f46138064 (patch) | |
| tree | c026b395a89052ac685d60890192484da4994dce /arch/arm/kernel/machine_kexec.c | |
| parent | 4cabd1d9625c7d88acd143f4021fbef75394f154 (diff) | |
| download | blackbird-op-linux-c564df4db85aac8d1d65a56176a0a25f46138064.tar.gz blackbird-op-linux-c564df4db85aac8d1d65a56176a0a25f46138064.zip | |
ARM: 7540/1: kexec: Check segment memory addresses
Ensure that the memory regions that are set within the segments
correspond to physical contiguous memory regions.
Reviewed-by: Simon Horman <horms@verge.net.au>
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/machine_kexec.c')
| -rw-r--r-- | arch/arm/kernel/machine_kexec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index dee34efca748..e29c3337ca81 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c @@ -8,6 +8,7 @@ #include <linux/reboot.h> #include <linux/io.h> #include <linux/irq.h> +#include <linux/memblock.h> #include <asm/pgtable.h> #include <linux/of_fdt.h> #include <asm/pgalloc.h> @@ -44,6 +45,11 @@ int machine_kexec_prepare(struct kimage *image) for (i = 0; i < image->nr_segments; i++) { current_segment = &image->segment[i]; + err = memblock_is_region_memory(current_segment->mem, + current_segment->memsz); + if (err) + return - EINVAL; + err = get_user(header, (__be32*)current_segment->buf); if (err) return err; |
