diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-12-17 16:02:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 17:15:19 -0800 |
| commit | 6899e92d65c490c5292752718ff277b123f8c00a (patch) | |
| tree | 9f3a6ebfc8bcf68ec5d74bfc12659e719ca61db3 /fs/binfmt_elf.c | |
| parent | 323c1260ba2c4b5c4b2a1e9ab6657cde54ccf554 (diff) | |
| download | olio-linux-3.10-6899e92d65c490c5292752718ff277b123f8c00a.tar.xz olio-linux-3.10-6899e92d65c490c5292752718ff277b123f8c00a.zip | |
binfmt_elf: fix corner case kfree of uninitialized data
If elf_core_dump() is called and fill_note_info() fails in the kmalloc()
then it returns 0 but has not yet initialised all the needed fields. As a
result we do a kfree(randomness) after correctly skipping the thread data.
[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 6d7d1647a68..0c42cdbabec 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1601,8 +1601,10 @@ static int fill_note_info(struct elfhdr *elf, int phdrs, info->thread = NULL; psinfo = kmalloc(sizeof(*psinfo), GFP_KERNEL); - if (psinfo == NULL) + if (psinfo == NULL) { + info->psinfo.data = NULL; /* So we don't free this wrongly */ return 0; + } fill_note(&info->psinfo, "CORE", NT_PRPSINFO, sizeof(*psinfo), psinfo); |