[PATCH 12/12] match_metadata_desc(): Fix memory leak

[PATCH 00/12] More leak and NULL pointer dereference fixes · <hidden> · 2011-11-02
[PATCH 01/12] mdadm: add missing break for UpdateSubarray · <hidden> · 2011-11-02
[PATCH 02/12] ping_monitor(): check file descriptor is valid before using and closing it · <hidden> · 2011-11-02
[PATCH 03/12] mdstat_read(): Check return value of dup() before using file descriptor · <hidden> · 2011-11-02
[PATCH 04/12] get_component_size(): Check read() return value for error before using it · <hidden> · 2011-11-02
[PATCH 05/12] array_try_spare(): open_dev() returns -1 on error, not zero · <hidden> · 2011-11-02
[PATCH 06/12] disk_init_and_add(): Fail if opening sysfs file descriptors fail · <hidden> · 2011-11-02
[PATCH 07/12] close_aa(): Verify file descriptors are valid before trying to close them · <hidden> · 2011-11-02
[PATCH 08/12] ahci_enumerate_ports(): Don't close fd that failed to open · <hidden> · 2011-11-02
[PATCH 09/12] unblock_monitor(): Check sra is valid before dereferencing · <hidden> · 2011-11-02
[PATCH 10/12] Manage_ro(): Check pointer rather than dereferencing it · <hidden> · 2011-11-02
[PATCH 11/12] fd2devname(): Don't dereference NULL pointer · <hidden> · 2011-11-02
[PATCH 12/12] match_metadata_desc(): Fix memory leak · <hidden> · 2011-11-02
Re: [PATCH 00/12] More leak and NULL pointer dereference fixes · NeilBrown <hidden> · 2011-11-02
Re: [PATCH 00/12] More leak and NULL pointer dereference fixes · Jes Sorensen <hidden> · 2011-11-03

STALE5364d

From: <hidden>
Date: 2011-11-02 14:42:17
Subsystem: the rest · Maintainer: Linus Torvalds

From: Jes Sorensen <redacted>

Signed-off-by: Jes Sorensen <redacted>
---
 super-mbr.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/super-mbr.c b/super-mbr.c
index 5eefdf6..6499963 100644
--- a/super-mbr.c
+++ b/super-mbr.c

@@ -169,13 +169,14 @@ static void getinfo_mbr(struct supertype *st, struct mdinfo *info, char *map)
 
 static struct supertype *match_metadata_desc(char *arg)
 {
-	struct supertype *st = malloc(sizeof(*st));
+	struct supertype *st;
 
-	if (!st)
-		return st;
 	if (strcmp(arg, "mbr") != 0)
 		return NULL;
 
+	st = malloc(sizeof(*st));
+	if (!st)
+		return st;
 	st->ss = &mbr;
 	st->info = NULL;
 	st->minor_version = 0;

-- 
1.7.6.4

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help