2021-05-25 12:40:46

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH v2] Bluetooth: fix the erroneous flush_work() order

From: linma <[email protected]>

In the cleanup routine for failed initialization of HCI device,
the flush_work(&hdev->rx_work) need to be finished before the
flush_work(&hdev->cmd_work). Otherwise, the hci_rx_work() can
possibly invoke new cmd_work and cause a bug, like double free,
in late processings.

This was assigned CVE-2021-3564.

This patch reorder the flush_work() to fix this bug.

Cc: Marcel Holtmann <[email protected]>
Cc: Johan Hedberg <[email protected]>
Cc: Luiz Augusto von Dentz <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lin Ma <[email protected]>
Signed-off-by: Hao Xiong <[email protected]>
Cc: stable <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/bluetooth/hci_core.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

v2: use "network comment style" for block comment.

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index fd12f1652bdf..7d71d104fdfd 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1610,8 +1610,13 @@ static int hci_dev_do_open(struct hci_dev *hdev)
} else {
/* Init failed, cleanup */
flush_work(&hdev->tx_work);
- flush_work(&hdev->cmd_work);
+
+ /* Since hci_rx_work() is possible to awake new cmd_work
+ * it should be flushed first to avoid unexpected call of
+ * hci_cmd_work()
+ */
flush_work(&hdev->rx_work);
+ flush_work(&hdev->cmd_work);

skb_queue_purge(&hdev->cmd_q);
skb_queue_purge(&hdev->rx_q);
--
2.31.1


2021-05-25 13:39:10

by bluez.test.bot

[permalink] [raw]
Subject: RE: [v2] Bluetooth: fix the erroneous flush_work() order

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=488173

---Test result---

Test Summary:
CheckPatch FAIL 0.77 seconds
GitLint PASS 0.12 seconds
BuildKernel PASS 529.82 seconds
TestRunner: Setup PASS 311.54 seconds
TestRunner: l2cap-tester PASS 2.46 seconds
TestRunner: bnep-tester PASS 1.76 seconds
TestRunner: mgmt-tester PASS 26.34 seconds
TestRunner: rfcomm-tester PASS 1.97 seconds
TestRunner: sco-tester PASS 1.94 seconds
TestRunner: smp-tester PASS 2.03 seconds
TestRunner: userchan-tester PASS 1.92 seconds

Details
##############################
Test: CheckPatch - FAIL - 0.77 seconds
Run checkpatch.pl script with rule in .checkpatch.conf
Bluetooth: fix the erroneous flush_work() order
WARNING: Invalid email format for stable: 'stable <[email protected]>', prefer '[email protected]'
#26:
Cc: stable <[email protected]>

WARNING: From:/Signed-off-by: email name mismatch: 'From: linma <[email protected]>' != 'Signed-off-by: Lin Ma <[email protected]>'

total: 0 errors, 2 warnings, 0 checks, 14 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.

"[PATCH] Bluetooth: fix the erroneous flush_work() order" has style problems, please review.

NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.


##############################
Test: GitLint - PASS - 0.12 seconds
Run gitlint with rule in .gitlint


##############################
Test: BuildKernel - PASS - 529.82 seconds
Build Kernel with minimal configuration supports Bluetooth


##############################
Test: TestRunner: Setup - PASS - 311.54 seconds
Setup environment for running Test Runner


##############################
Test: TestRunner: l2cap-tester - PASS - 2.46 seconds
Run test-runner with l2cap-tester
Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0

##############################
Test: TestRunner: bnep-tester - PASS - 1.76 seconds
Run test-runner with bnep-tester
Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0

##############################
Test: TestRunner: mgmt-tester - PASS - 26.34 seconds
Run test-runner with mgmt-tester
Total: 427, Passed: 412 (96.5%), Failed: 0, Not Run: 15

##############################
Test: TestRunner: rfcomm-tester - PASS - 1.97 seconds
Run test-runner with rfcomm-tester
Total: 9, Passed: 9 (100.0%), Failed: 0, Not Run: 0

##############################
Test: TestRunner: sco-tester - PASS - 1.94 seconds
Run test-runner with sco-tester
Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0

##############################
Test: TestRunner: smp-tester - PASS - 2.03 seconds
Run test-runner with smp-tester
Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0

##############################
Test: TestRunner: userchan-tester - PASS - 1.92 seconds
Run test-runner with userchan-tester
Total: 3, Passed: 3 (100.0%), Failed: 0, Not Run: 0



---
Regards,
Linux Bluetooth


Attachments:
l2cap-tester.log (43.31 kB)
bnep-tester.log (3.47 kB)
mgmt-tester.log (547.30 kB)
rfcomm-tester.log (11.40 kB)
sco-tester.log (9.68 kB)
smp-tester.log (11.55 kB)
userchan-tester.log (5.33 kB)
Download all attachments

2021-05-25 17:02:50

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [v2] Bluetooth: fix the erroneous flush_work() order

On Tue, May 25, 2021 at 06:36:39AM -0700, [email protected] wrote:
> 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=488173
>
> ---Test result---
>
> Test Summary:
> CheckPatch FAIL 0.77 seconds
> GitLint PASS 0.12 seconds
> BuildKernel PASS 529.82 seconds
> TestRunner: Setup PASS 311.54 seconds
> TestRunner: l2cap-tester PASS 2.46 seconds
> TestRunner: bnep-tester PASS 1.76 seconds
> TestRunner: mgmt-tester PASS 26.34 seconds
> TestRunner: rfcomm-tester PASS 1.97 seconds
> TestRunner: sco-tester PASS 1.94 seconds
> TestRunner: smp-tester PASS 2.03 seconds
> TestRunner: userchan-tester PASS 1.92 seconds
>
> Details
> ##############################
> Test: CheckPatch - FAIL - 0.77 seconds
> Run checkpatch.pl script with rule in .checkpatch.conf
> Bluetooth: fix the erroneous flush_work() order
> WARNING: Invalid email format for stable: 'stable <[email protected]>', prefer '[email protected]'
> #26:
> Cc: stable <[email protected]>
>
> WARNING: From:/Signed-off-by: email name mismatch: 'From: linma <[email protected]>' != 'Signed-off-by: Lin Ma <[email protected]>'
>
> total: 0 errors, 2 warnings, 0 checks, 14 lines checked
>
> NOTE: For some of the reported defects, checkpatch may be able to
> mechanically convert to the typical style using --fix or --fix-inplace.
>
> "[PATCH] Bluetooth: fix the erroneous flush_work() order" has style problems, please review.
>
> NOTE: If any of the errors are false positives, please report
> them to the maintainer, see CHECKPATCH in MAINTAINERS.
>
>

Do these matter enough for me to do a v3?

The first one is crazy, the second one, well, I can understand...

thanks,

greg k-h

2021-05-25 21:39:09

by Luiz Augusto von Dentz

[permalink] [raw]
Subject: Re: [v2] Bluetooth: fix the erroneous flush_work() order

Hi Greg,

On Tue, May 25, 2021 at 10:02 AM Greg KH <[email protected]> wrote:
>
> On Tue, May 25, 2021 at 06:36:39AM -0700, [email protected] wrote:
> > 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=488173
> >
> > ---Test result---
> >
> > Test Summary:
> > CheckPatch FAIL 0.77 seconds
> > GitLint PASS 0.12 seconds
> > BuildKernel PASS 529.82 seconds
> > TestRunner: Setup PASS 311.54 seconds
> > TestRunner: l2cap-tester PASS 2.46 seconds
> > TestRunner: bnep-tester PASS 1.76 seconds
> > TestRunner: mgmt-tester PASS 26.34 seconds
> > TestRunner: rfcomm-tester PASS 1.97 seconds
> > TestRunner: sco-tester PASS 1.94 seconds
> > TestRunner: smp-tester PASS 2.03 seconds
> > TestRunner: userchan-tester PASS 1.92 seconds
> >
> > Details
> > ##############################
> > Test: CheckPatch - FAIL - 0.77 seconds
> > Run checkpatch.pl script with rule in .checkpatch.conf
> > Bluetooth: fix the erroneous flush_work() order
> > WARNING: Invalid email format for stable: 'stable <[email protected]>', prefer '[email protected]'
> > #26:
> > Cc: stable <[email protected]>
> >
> > WARNING: From:/Signed-off-by: email name mismatch: 'From: linma <[email protected]>' != 'Signed-off-by: Lin Ma <[email protected]>'
> >
> > total: 0 errors, 2 warnings, 0 checks, 14 lines checked
> >
> > NOTE: For some of the reported defects, checkpatch may be able to
> > mechanically convert to the typical style using --fix or --fix-inplace.
> >
> > "[PATCH] Bluetooth: fix the erroneous flush_work() order" has style problems, please review.
> >
> > NOTE: If any of the errors are false positives, please report
> > them to the maintainer, see CHECKPATCH in MAINTAINERS.
> >
> >
>
> Do these matter enough for me to do a v3?

Nah, we treat checkpatch as just informational I didn't know it
actually checked the git patch description.

> The first one is crazy, the second one, well, I can understand...

I wonder why checkpatch is even doing something like that, anyway I
believe the CI just runs checkpatch from mainline.

>
> thanks,
>
> greg k-h



--
Luiz Augusto von Dentz

2021-05-27 20:20:09

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH v2] Bluetooth: fix the erroneous flush_work() order

Hi Greg,

> In the cleanup routine for failed initialization of HCI device,
> the flush_work(&hdev->rx_work) need to be finished before the
> flush_work(&hdev->cmd_work). Otherwise, the hci_rx_work() can
> possibly invoke new cmd_work and cause a bug, like double free,
> in late processings.
>
> This was assigned CVE-2021-3564.
>
> This patch reorder the flush_work() to fix this bug.
>
> Cc: Marcel Holtmann <[email protected]>
> Cc: Johan Hedberg <[email protected]>
> Cc: Luiz Augusto von Dentz <[email protected]>
> Cc: "David S. Miller" <[email protected]>
> Cc: Jakub Kicinski <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Lin Ma <[email protected]>
> Signed-off-by: Hao Xiong <[email protected]>
> Cc: stable <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> ---
> net/bluetooth/hci_core.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)

patch has been applied to bluetooth-stable tree.

Regards

Marcel

2021-06-08 04:57:16

by Salvatore Bonaccorso

[permalink] [raw]
Subject: Re: [PATCH v2] Bluetooth: fix the erroneous flush_work() order

Hi Greg,

On Thu, May 27, 2021 at 10:14:59PM +0200, Marcel Holtmann wrote:
> Hi Greg,
>
> > In the cleanup routine for failed initialization of HCI device,
> > the flush_work(&hdev->rx_work) need to be finished before the
> > flush_work(&hdev->cmd_work). Otherwise, the hci_rx_work() can
> > possibly invoke new cmd_work and cause a bug, like double free,
> > in late processings.
> >
> > This was assigned CVE-2021-3564.
> >
> > This patch reorder the flush_work() to fix this bug.
> >
> > Cc: Marcel Holtmann <[email protected]nn.org>
> > Cc: Johan Hedberg <[email protected]>
> > Cc: Luiz Augusto von Dentz <[email protected]>
> > Cc: "David S. Miller" <[email protected]>
> > Cc: Jakub Kicinski <[email protected]>
> > Cc: [email protected]
> > Cc: [email protected]
> > Cc: [email protected]
> > Signed-off-by: Lin Ma <[email protected]>
> > Signed-off-by: Hao Xiong <[email protected]>
> > Cc: stable <[email protected]>
> > Signed-off-by: Greg Kroah-Hartman <[email protected]>
> > ---
> > net/bluetooth/hci_core.c | 7 ++++++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
>
> patch has been applied to bluetooth-stable tree.

Can you queue this one as well for the stable series? It is
6a137caec23aeb9e036cdfd8a46dd8a366460e5d commit upstream and in
5.13-rc5.

Regards,
Salvatore