Skip to contentSkip to conversation

Fix memory errors on ppc

PATCH In review Suzuki Poulose 2 participants 2 messages Apr 27, 2011

Subsystems (2)
Live update kexec handover (KHO)
lore
Share & tools
lore

Suzuki Poulose

author
#0 lore raw

PATCH 1/1 Fix memory errors on ppc

Fix memory errors on ppc

Fixes buffer overflow and improper realloc() in realloc_memory_ranges().

Signed-off-by Suzuki K. Poulose <[email protected]>
kexec/arch/ppc/crashdump-powerpc.c +1 -1
index eb82122..371137c 100644
@@ -79,7 +79,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;
kexec/arch/ppc/kexec-ppc.c +4 -3
index ab76d6f..96fbc12 100644
@@ -192,11 +192,12 @@ static int realloc_memory_ranges(void)
 	max_memory_ranges++;
 	memory_range_len = sizeof(struct memory_range) * max_memory_ranges;
 
-	memory_range = (struct memory_range *) malloc(memory_range_len);
+	memory_range = (struct memory_range *) realloc(memory_range,
+							memory_range_len);
 	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 +320,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;

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#1 lore raw
Quoted 5 lines · Suzuki Poulose

Fix memory errors on ppc

Fixes buffer overflow and improper realloc() in realloc_memory_ranges().

Signed-off-by Suzuki K. Poulose <[email protected]>

Thanks.

For some reason I still had trouble applying your patch, so I applied it manually. I have pushed the following:

From 806ef8870539a6c74a2a98188d0207a038b16f77 Mon Sep 17 00:00:00 2001
From: Suzuki Poulose <[email protected]>
Date: Wed, 27 Apr 2011 15:38:49 +0530
Subject: [PATCH] Fix memory errors on ppc

Fixes buffer overflow and improper realloc() in realloc_memory_ranges().

Signed-off-by Suzuki K. Poulose <[email protected]>

(manually applied)

Signed-off-by Simon Horman <[email protected]>
---
 kexec/arch/ppc/crashdump-powerpc.c |    2 +-
 kexec/arch/ppc/kexec-ppc.c         |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
kexec/arch/ppc/crashdump-powerpc.c +1 -1
index eb82122..371137c 100644
@@ -79,7 +79,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;
kexec/arch/ppc/kexec-ppc.c +4 -3
index ab76d6f..db00b96 100644
@@ -192,11 +192,12 @@ static int realloc_memory_ranges(void)
 	max_memory_ranges++;
 	memory_range_len = sizeof(struct memory_range) * max_memory_ranges;
 
-	memory_range = (struct memory_range *) malloc(memory_range_len);
+	memory_range = (struct memory_range *) realloc(memory_range,
+						       memory_range_len);
 	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 +320,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;
Signature · 7 lines
1.7.4.1


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec