Revert "Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work"

Commit Message

Liu Jian April 14, 2023, 10:30 a.m. UTC

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 <[e-mail]>
---
 drivers/bluetooth/btsdio.c | 1 -
 1 file changed, 1 deletion(-)

Comments

[e-mail] April 14, 2023, 10:57 a.m. UTC | #1

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=739791

---Test result---

Test Summary:
CheckPatch                    PASS      0.58 seconds
GitLint                       PASS      0.28 seconds
SubjectPrefix                 PASS      0.10 seconds
BuildKernel                   PASS      32.15 seconds
CheckAllWarning               PASS      35.17 seconds
CheckSparse                   PASS      40.25 seconds
CheckSmatch                   PASS      109.91 seconds
BuildKernel32                 PASS      31.43 seconds
TestRunnerSetup               PASS      457.42 seconds
TestRunner_l2cap-tester       PASS      16.86 seconds
TestRunner_iso-tester         PASS      17.21 seconds
TestRunner_bnep-tester        PASS      5.52 seconds
TestRunner_mgmt-tester        PASS      114.03 seconds
TestRunner_rfcomm-tester      PASS      8.90 seconds
TestRunner_sco-tester         PASS      8.15 seconds
TestRunner_ioctl-tester       PASS      9.67 seconds
TestRunner_mesh-tester        PASS      7.05 seconds
TestRunner_smp-tester         PASS      7.96 seconds
TestRunner_userchan-tester    PASS      5.82 seconds
IncrementalBuild              PASS      29.42 seconds



---
Regards,
Linux Bluetooth

[e-mail] April 14, 2023, 9:30 p.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Fri, 14 Apr 2023 18:30:06 +0800 you wrote:
> 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 <[e-mail]>
> 
> [...]

Here is the summary with links:
  - Revert "Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work"
    https://git.kernel.org/bluetooth/bluetooth-next/c/492cf2b505d6

You are awesome, thank you!

Patch

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 51000320e1ea..f19d31ee37ea 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -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;