diff options
| author | Jesper Juhl <jj@chaosbits.net> | 2012-03-07 19:09:34 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 12:31:41 -0700 |
| commit | e2ece17aceb773d9be4f0eb75f7f7360bcf06259 (patch) | |
| tree | 81b99c5f61e141cd96b537f6cf8e1cd02d0ab913 | |
| parent | a5a2f494f9eff644c5369807a472cc6d9722baed (diff) | |
dm ioctl: do not leak argv if target message only contains whitespace
commit 902c6a96a7cb9c50d2a8aed1788efad0a5d8f04c upstream.
If 'argc' is zero we jump to the 'out:' label, but this leaks the
(unused) memory that 'dm_split_args()' allocated for 'argv' if the
string being split consisted entirely of whitespace. Jump to the
'out_argv:' label instead to free up that memory.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/md/dm-ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 31c2dc25886d..1ce84ed0b765 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); |