]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
memstick: jmb38x_ms: use appropriate free function in jmb38x_ms_alloc_host()
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 11 Oct 2021 12:39:12 +0000 (15:39 +0300)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:48:22 +0000 (09:48 +0100)
BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit beae4a6258e64af609ad5995cc6b6056eb0d898e ]

The "msh" pointer is device managed, meaning that memstick_alloc_host()
calls device_initialize() on it.  That means that it can't be free
using kfree() but must instead be freed with memstick_free_host().
Otherwise it leads to a tiny memory leak of device resources.

Fixes: 60fdd931d577 ("memstick: add support for JMicron jmb38x MemoryStick host controller")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20211011123912.GD15188@kili
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/memstick/host/jmb38x_ms.c

index f9a93b0565e15f76c10de1fe9ff0aca233a04207..435d4c058b20e77ae61e77cac70ef9e7b7171582 100644 (file)
@@ -882,7 +882,7 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt)
 
        iounmap(host->addr);
 err_out_free:
-       kfree(msh);
+       memstick_free_host(msh);
        return NULL;
 }