summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2013-02-27 17:03:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 19:10:12 -0800
commitfe88f2ee33731f0934e8fb26f762b6715e43ff6f (patch)
treeb6e8af3812192ca5d8a60c51faaa9a025dbe7a5e
parent0d0bf6674136eb861b37213160b16388cfc1926d (diff)
downloadlinux-3.10-fe88f2ee33731f0934e8fb26f762b6715e43ff6f.tar.gz
linux-3.10-fe88f2ee33731f0934e8fb26f762b6715e43ff6f.tar.bz2
linux-3.10-fe88f2ee33731f0934e8fb26f762b6715e43ff6f.zip
kexec: prevent double free on image allocation failure
If kimage_normal_alloc() fails to initialize an allocated kimage, it will free the image but would still set 'rimage', as a result kexec_load will try to free it again. This would explode as part of the freeing process is accessing internal members which point to uninitialized memory. Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/kexec.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 2348bd6ef2a..855bfbbf404 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -242,8 +242,6 @@ static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry,
if (result)
goto out;
- *rimage = image;
-
/*
* Find a location for the control code buffer, and add it
* the vector of segments so that it's pages will also be