drivers/md/dm-ioctl.c::target_message(): don't leak 'argv' mem

Started by Jesper Juhl on Jan 15, 2012 · 2 messages from 2 authors · Last reply Jan 15, 2012

Subsystems (2)

Maintainers (5)

Show 1 more
STALE5423d

open the first message on its own page

Message details and related content
If, after allocating memory for 'argv' via dm_split_args(...), we take
the true branch of 'if (!argc)', we'll jump to the 'out:' label and
neglect to free the memory we allocated. We should instead jump to the
'out_argv:' label in that case as far as I can tell.

Signed-off-by: Jesper Juhl <redacted>
---
 drivers/md/dm-ioctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

 Compile tested only.
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 31c2dc2..1ce84ed 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1437,7 +1437,7 @@ static int target_message(struct dm_ioctl *param, size_t param_size)
 
 	if (!argc) {
 		DMWARN("Empty message received.");
-		goto out;
+		goto out_argv;
 	}
 
 	table = dm_get_live_table(md);
-- 
1.7.8.3


-- 
Jesper Juhl <jj@chaosbits.net>       http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

Re: [dm-devel] [PATCH] drivers/md/dm-ioctl.c::target_message(): don't leak 'argv' mem

Message details and related content
Acked-by: Mikulas Patocka <mpatocka@redhat.com>

BTW., it should be also backported to RHEL-6.

Mikulas

On Sun, 15 Jan 2012, Jesper Juhl wrote:
quoted hunk
If, after allocating memory for 'argv' via dm_split_args(...), we take
the true branch of 'if (!argc)', we'll jump to the 'out:' label and
neglect to free the memory we allocated. We should instead jump to the
'out_argv:' label in that case as far as I can tell.

Signed-off-by: Jesper Juhl <redacted>
---
 drivers/md/dm-ioctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

 Compile tested only.
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 31c2dc2..1ce84ed 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1437,7 +1437,7 @@ static int target_message(struct dm_ioctl *param, size_t param_size)
 
 	if (!argc) {
 		DMWARN("Empty message received.");
-		goto out;
+		goto out_argv;
 	}
 
 	table = dm_get_live_table(md);
-- 
1.7.8.3


-- 
Jesper Juhl <jj@chaosbits.net>       http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help