summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorQinglang Miao <miaoqinglang@huawei.com>2020-11-20 15:48:46 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 11:53:20 +0100
commit365a94fc1e3d0c78df67b39b819ceb645b96b391 (patch)
treee2948321bda4a3c68ddc9401278956a039a49edf /drivers/memstick
parentc802d9e5e69d9f631a9f126a2b645f2fbac4858f (diff)
downloadlinux-stable-365a94fc1e3d0c78df67b39b819ceb645b96b391.tar.gz
linux-stable-365a94fc1e3d0c78df67b39b819ceb645b96b391.tar.bz2
linux-stable-365a94fc1e3d0c78df67b39b819ceb645b96b391.zip
memstick: fix a double-free bug in memstick_check
[ Upstream commit e3e9ced5c93803d5b2ea1942c4bf0192622531d6 ] kfree(host->card) has been called in put_device so that another kfree would raise cause a double-free bug. Fixes: 0193383a5833 ("memstick: core: fix device_register() error handling") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com> Link: https://lore.kernel.org/r/20201120074846.31322-1-miaoqinglang@huawei.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/core/memstick.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index ef03d6fafc5c..12bc3f5a6cbb 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -468,7 +468,6 @@ static void memstick_check(struct work_struct *work)
host->card = card;
if (device_register(&card->dev)) {
put_device(&card->dev);
- kfree(host->card);
host->card = NULL;
}
} else