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>

diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
index dee34ef..e29c333 100644 (file)
--- 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/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>
 #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];
 
        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;
                err = get_user(header, (__be32*)current_segment->buf);
                if (err)
                        return err;