2014-10-01 20:58:58

by Alexey Khoroshilov

Subject: [PATCH] dm-log-userspace: fix memory leak on failure path in dm_ulog_tfr_init()

If cn_add_callback() fails in dm_ulog_tfr_init(), it does not
deallocate prealloced memory but calls cn_del_callback().
It looks like a misprint.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <[email protected]>
---
drivers/md/dm-log-userspace-transfer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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)

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;
}

--
1.9.1

2014-10-02 16:57:51

by Brassow Jonathan

Subject: Re: [PATCH] dm-log-userspace: fix memory leak on failure path in dm_ulog_tfr_init()

On Oct 1, 2014, at 3:58 PM, Alexey Khoroshilov <[email protected]> wrote:

> If cn_add_callback() fails in dm_ulog_tfr_init(), it does not
> deallocate prealloced memory but calls cn_del_callback().
> It looks like a misprint.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <[email protected]>

Signed-off-by: Jonathan Brassow <[email protected]>