aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorBernhard Walle <bwalle@suse.de>2007-01-28 07:47:02 -0500
committerTony Luck <tony.luck@intel.com>2007-02-05 17:06:44 -0500
commitc2c77fe8df3e0322a613ba1540910632ad14d96d (patch)
tree38a6da2e1995b3050e32947019b1166e380c1ec5 /arch/ia64
parent87f76d3aafe5b5e0a1d6d857088a0263b35afa6b (diff)
[IA64] Fix NULL-pointer dereference in ia64_machine_kexec()
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@suse.de> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/crash.c5
-rw-r--r--arch/ia64/kernel/machine_kexec.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index 2018e624f5e2..9d92097ce96d 100644
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -118,6 +118,11 @@ machine_crash_shutdown(struct pt_regs *pt)
118static void 118static void
119machine_kdump_on_init(void) 119machine_kdump_on_init(void)
120{ 120{
121 if (!ia64_kimage) {
122 printk(KERN_NOTICE "machine_kdump_on_init(): "
123 "kdump not configured\n");
124 return;
125 }
121 local_irq_disable(); 126 local_irq_disable();
122 kexec_disable_iosapic(); 127 kexec_disable_iosapic();
123 machine_kexec(ia64_kimage); 128 machine_kexec(ia64_kimage);
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index e51cd904a23e..4f0f3b8c1ee2 100644
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -82,6 +82,7 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)
82 unsigned long vector; 82 unsigned long vector;
83 int ii; 83 int ii;
84 84
85 BUG_ON(!image);
85 if (image->type == KEXEC_TYPE_CRASH) { 86 if (image->type == KEXEC_TYPE_CRASH) {
86 crash_save_this_cpu(); 87 crash_save_this_cpu();
87 current->thread.ksp = (__u64)info->sw - 16; 88 current->thread.ksp = (__u64)info->sw - 16;
@@ -120,6 +121,7 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)
120 121
121void machine_kexec(struct kimage *image) 122void machine_kexec(struct kimage *image)
122{ 123{
124 BUG_ON(!image);
123 unw_init_running(ia64_machine_kexec, image); 125 unw_init_running(ia64_machine_kexec, image);
124 for(;;); 126 for(;;);
125} 127}