aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorAlexey Khoroshilov <khoroshilov@ispras.ru>2014-10-01 22:58:35 +0200
committerBen Hutchings <ben@decadent.org.uk>2014-12-14 16:23:46 +0000
commit6df54425eb8653a399e45024941a4b977f12922d (patch)
tree32ca30e87e0898754566cd0fdec26d1b4dcbfaf2 /drivers/md
parent801da9d2d994143c6f1eda489918c26cd0a277d1 (diff)
downloadkernel_samsung_smdk4412-6df54425eb8653a399e45024941a4b977f12922d.zip
kernel_samsung_smdk4412-6df54425eb8653a399e45024941a4b977f12922d.tar.gz
kernel_samsung_smdk4412-6df54425eb8653a399e45024941a4b977f12922d.tar.bz2
dm log userspace: fix memory leak in dm_ulog_tfr_init failure path
commit 56ec16cb1e1ce46354de8511eef962a417c32c92 upstream. 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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/dm-log-userspace-transfer.c2
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 1f23e04..e5bd3ef 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)
r = cn_add_callback(&ulog_cn_id, "dmlogusr", cn_ulog_callback);
if (r) {
- cn_del_callback(&ulog_cn_id);
+ kfree(prealloced_cn_msg);
return r;
}