Revert "Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished...
authorLiu Jian <liujian56@huawei.com>
Fri, 14 Apr 2023 10:30:06 +0000 (18:30 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:03:26 +0000 (23:03 +0900)
[ Upstream commit db2bf510bd5d57f064d9e1db395ed86a08320c54 ]

This reverts commit 1e9ac114c4428fdb7ff4635b45d4f46017e8916f.

This patch introduces a possible null-ptr-def problem. Revert it. And the
fixed bug by this patch have resolved by commit 73f7b171b7c0 ("Bluetooth:
btsdio: fix use after free bug in btsdio_remove due to race condition").

Fixes: 1e9ac114c442 ("Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work")
Signed-off-by: Liu Jian <liujian56@huawei.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/bluetooth/btsdio.c

index 02893600db390402858ebf65618832f79cadc375..795be33f2892d5ea41afbcb461c4e0c8e939ef2a 100644 (file)
@@ -354,7 +354,6 @@ static void btsdio_remove(struct sdio_func *func)
 
        BT_DBG("func %p", func);
 
-       cancel_work_sync(&data->work);
        if (!data)
                return;