git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IA64] Fix NULL-pointer dereference in ia64_machine_kexec()
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
machine_kexec.c
diff --git
a/arch/ia64/kernel/machine_kexec.c
b/arch/ia64/kernel/machine_kexec.c
index
e51cd90
..
4f0f3b8
100644
(file)
--- 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)
unsigned long vector;
int ii;
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;
if (image->type == KEXEC_TYPE_CRASH) {
crash_save_this_cpu();
current->thread.ksp = (__u64)info->sw - 16;
@@
-120,6
+121,7
@@
static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)
void machine_kexec(struct kimage *image)
{
void machine_kexec(struct kimage *image)
{
+ BUG_ON(!image);
unw_init_running(ia64_machine_kexec, image);
for(;;);
}
unw_init_running(ia64_machine_kexec, image);
for(;;);
}