The patch titled
Fix NULL-pointer dereference in ia64_machine_kexec()
has been removed from the -mm tree. Its filename was
fix-null-pointer-dereference-in-ia64_machine_kexec.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Fix NULL-pointer dereference in ia64_machine_kexec()
From: Bernhard Walle <bwalle@xxxxxxx>
This patch fixes a NULL-pointer dereference in ia64_machine_kexec().
The variable ia64_kimage is set in machine_kexec_prepare() which is
called from sys_kexec_load(). If kdump wasn't configured before,
ia64_kimage is NULL. machine_kdump_on_init() passes ia64_kimage() to
machine_kexec() which assumes a valid value.
The patch also adds a few sanity checks for the image to simplify
debugging of similar problems in future.
Signed-off-by: Bernhard Walle <bwalle@xxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Cc: Magnus Damm <magnus@xxxxxxxxxxxxx>
Cc: Simon Horman <horms@xxxxxxxxxxxx>
Cc: Jay Lan <jlan@xxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/ia64/kernel/crash.c | 5 +++++
arch/ia64/kernel/machine_kexec.c | 2 ++
2 files changed, 7 insertions(+)
diff -puN arch/ia64/kernel/crash.c~fix-null-pointer-dereference-in-ia64_machine_kexec arch/ia64/kernel/crash.c
--- a/arch/ia64/kernel/crash.c~fix-null-pointer-dereference-in-ia64_machine_kexec
+++ a/arch/ia64/kernel/crash.c
@@ -118,6 +118,11 @@ machine_crash_shutdown(struct pt_regs *p
static void
machine_kdump_on_init(void)
{
+ if (!ia64_kimage) {
+ printk(KERN_NOTICE "machine_kdump_on_init(): "
+ "kdump not configured\n");
+ return;
+ }
local_irq_disable();
kexec_disable_iosapic();
machine_kexec(ia64_kimage);
diff -puN arch/ia64/kernel/machine_kexec.c~fix-null-pointer-dereference-in-ia64_machine_kexec arch/ia64/kernel/machine_kexec.c
--- a/arch/ia64/kernel/machine_kexec.c~fix-null-pointer-dereference-in-ia64_machine_kexec
+++ a/arch/ia64/kernel/machine_kexec.c
@@ -95,6 +95,7 @@ static void ia64_machine_kexec(struct un
unsigned long vector;
int ii;
+ BUG_ON(!image);
if (image->type == KEXEC_TYPE_CRASH) {
crash_save_this_cpu();
current->thread.ksp = (__u64)info->sw - 16;
@@ -133,6 +134,7 @@ static void ia64_machine_kexec(struct un
void machine_kexec(struct kimage *image)
{
+ BUG_ON(!image);
unw_init_running(ia64_machine_kexec, image);
for(;;);
}
_
Patches currently in -mm which might be from bwalle@xxxxxxx are
origin.patch
spider-fix-gregkh-driver-network-device.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
