[PATCH] Fix memory access errors for kexec PPC
Suzuki Poulose
suzuki at in.ibm.com
Wed Apr 20 05:32:02 EDT 2011
Hi,
I was trying the kexec for ppc32 and came across a couple of memory errors
while running with glibc.
The attached patch is the outcome of the glibc's alerts !
We define buf[MAXBYTES-1] and issue fread(buf, 1, MAXBYTES, file), which glibc
reports an error.
Also there is a typo in the realloc_memory_ranges() code for ppc which causes in
a double free().
Kindly apply.
Thanks
Suzuki
---
Signed-off-by: Suzuki K. Poulose <suzuki at in.ibm.com>
diff --git a/kexec/arch/ppc/crashdump-powerpc.c b/kexec/arch/ppc/crashdump-powerpc.c
index 7bfad20..7853dbe 100644
--- a/kexec/arch/ppc/crashdump-powerpc.c
+++ b/kexec/arch/ppc/crashdump-powerpc.c
@@ -83,7 +83,7 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges)
int memory_ranges = 0;
char device_tree[256] = "/proc/device-tree/";
char fname[256];
- char buf[MAXBYTES-1];
+ char buf[MAXBYTES];
DIR *dir, *dmem;
FILE *file;
struct dirent *dentry, *mentry;
diff --git a/kexec/arch/ppc/kexec-ppc.c b/kexec/arch/ppc/kexec-ppc.c
index ab76d6f..837021f 100644
--- a/kexec/arch/ppc/kexec-ppc.c
+++ b/kexec/arch/ppc/kexec-ppc.c
@@ -196,7 +196,7 @@ static int realloc_memory_ranges(void)
if (!memory_range)
goto err;
- base_memory_range = (struct memory_range *) realloc(memory_range,
+ base_memory_range = (struct memory_range *) realloc(base_memory_range,
memory_range_len);
if (!base_memory_range)
goto err;
@@ -319,7 +319,7 @@ static int get_devtree_details(unsigned long kexec_flags)
unsigned long long htab_base, htab_size;
unsigned long long kernel_end;
unsigned long long initrd_start, initrd_end;
- char buf[MAXBYTES-1];
+ char buf[MAXBYTES];
char device_tree[256] = "/proc/device-tree/";
char fname[256];
DIR *dir, *cdir;
More information about the kexec
mailing list