Subject: + memstick-fix-memory-leak-in-memstick_check-error-path.patch added to -mm tree To: Larry.Finger@xxxxxxxxxxxx,catalin.marinas@xxxxxxx,gregkh@xxxxxxxxxxxxxxxxxxx,kay.sievers@xxxxxxxx,oakad@xxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 08 Oct 2013 13:59:32 -0700 The patch titled Subject: memstick: fix memory leak in memstick_check() error path has been added to the -mm tree. Its filename is memstick-fix-memory-leak-in-memstick_check-error-path.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/memstick-fix-memory-leak-in-memstick_check-error-path.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/memstick-fix-memory-leak-in-memstick_check-error-path.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Larry Finger <Larry.Finger@xxxxxxxxxxxx> Subject: memstick: fix memory leak in memstick_check() error path With kernel 3.12-rc3, kmemleak reports the following leak: > unreferenced object 0xffff8800ae85c190 (size 16): > comm "kworker/u4:3", pid 685, jiffies 4294916336 (age 2831.760s) > hex dump (first 16 bytes): > 6d 65 6d 73 74 69 63 6b 30 00 00 00 00 00 00 00 memstick0....... > backtrace: > [<ffffffff8146a0d1>] kmemleak_alloc+0x21/0x50 > [<ffffffff81160720>] __kmalloc_track_caller+0x160/0x2f0 > [<ffffffff81237b9b>] kvasprintf+0x5b/0x90 > [<ffffffff8122c0c1>] kobject_set_name_vargs+0x21/0x60 > [<ffffffff812e7f5c>] dev_set_name+0x3c/0x40 > [<ffffffffa02bf918>] memstick_check+0xb8/0x340 [memstick] > [<ffffffff81069862>] process_one_work+0x1d2/0x670 > [<ffffffff8106a88a>] worker_thread+0x11a/0x370 > [<ffffffff81072ea6>] kthread+0xd6/0xe0 > [<ffffffff81478bbc>] ret_from_fork+0x7c/0xb0 This problem was introduced by commit 0252c3b "memstick: struct device - replace bus_id with dev_name(), dev_set_name()" where the name is not freed in the error path. The name is also leaked in memstick_free_card(). Thanks to Catalin Marinas for suggesting the fix. Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx> Cc: Kay Sievers <kay.sievers@xxxxxxxx> Cc: Alex Dubov <oakad@xxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/memstick/core/memstick.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/memstick/core/memstick.c~memstick-fix-memory-leak-in-memstick_check-error-path drivers/memstick/core/memstick.c --- a/drivers/memstick/core/memstick.c~memstick-fix-memory-leak-in-memstick_check-error-path +++ a/drivers/memstick/core/memstick.c @@ -195,6 +195,7 @@ static void memstick_free_card(struct de { struct memstick_dev *card = container_of(dev, struct memstick_dev, dev); + kfree(card->dev.kobj.name); kfree(card); } @@ -415,6 +416,7 @@ static struct memstick_dev *memstick_all return card; err_out: host->card = old_card; + kfree(card->dev.kobj.name); kfree(card); return NULL; } _ Patches currently in -mm which might be from Larry.Finger@xxxxxxxxxxxx are memstick-fix-memory-leak-in-memstick_check-error-path.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html