---

yaml --- r: 346426 b: refs/heads/master c: 6899e92 h: refs/heads/master v: v3
git-mirror · Dec 18, 2012 · 9969ace · 9969ace
1 parent 04d021f
commit 9969ace
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 323c1260ba2c4b5c4b2a1e9ab6657cde54ccf554
+refs/heads/master: 6899e92d65c490c5292752718ff277b123f8c00a
diff --git a/trunk/fs/binfmt_elf.c b/trunk/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);