diff options
author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2014-10-01 16:58:35 -0400 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2014-10-05 20:03:38 -0400 |
commit | 56ec16cb1e1ce46354de8511eef962a417c32c92 (patch) | |
tree | bdc75b4c2fc10dd0087fdf05b47739902acf52f2 | |
parent | 0e825862f3c04cee40e25f55680333728a4ffa9b (diff) |
dm log userspace: fix memory leak in dm_ulog_tfr_init failure path
If cn_add_callback() fails in dm_ulog_tfr_init(), it does not
deallocate prealloced memory but calls cn_del_callback().
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Reviewed-by: Jonathan Brassow <jbrassow@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
-rw-r--r-- | drivers/md/dm-log-userspace-transfer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c index b428c0ae63d5..39ad9664d397 100644 --- a/drivers/md/dm-log-userspace-transfer.c +++ b/drivers/md/dm-log-userspace-transfer.c | |||
@@ -272,7 +272,7 @@ int dm_ulog_tfr_init(void) | |||
272 | 272 | ||
273 | r = cn_add_callback(&ulog_cn_id, "dmlogusr", cn_ulog_callback); | 273 | r = cn_add_callback(&ulog_cn_id, "dmlogusr", cn_ulog_callback); |
274 | if (r) { | 274 | if (r) { |
275 | cn_del_callback(&ulog_cn_id); | 275 | kfree(prealloced_cn_msg); |
276 | return r; | 276 | return r; |
277 | } | 277 | } |
278 | 278 | ||