diff mbox series

Bluetooth: hci_core: Fix unbalanced unlock in set_device_flags()

Message ID 20220302134439.515377-1-hdegoede@redhat.com (mailing list archive)
State Accepted
Headers show
Series Bluetooth: hci_core: Fix unbalanced unlock in set_device_flags() | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/checkpatch success Checkpatch PASS
tedd_an/gitlint success Gitlint PASS
tedd_an/subjectprefix success PASS
tedd_an/buildkernel success Build Kernel PASS
tedd_an/buildkernel32 success Build Kernel32 PASS
tedd_an/incremental_build success Pass
tedd_an/testrunnersetup success Test Runner Setup PASS
tedd_an/testrunnerl2cap-tester success Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunnerbnep-tester success Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunnermgmt-tester success Total: 493, Passed: 493 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunnerrfcomm-tester fail Total: 10, Passed: 9 (90.0%), Failed: 1, Not Run: 0
tedd_an/testrunnersco-tester success Total: 12, Passed: 12 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunnersmp-tester success Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunneruserchan-tester success Total: 4, Passed: 4 (100.0%), Failed: 0, Not Run: 0

Commit Message

Hans de Goede March 2, 2022, 1:44 p.m. UTC
There is only one "goto done;" in set_device_flags() and this happens
*before* hci_dev_lock() is called, move the done label to after the
hci_dev_unlock() to fix the following unlock balance:

[   31.493567] =====================================
[   31.493571] WARNING: bad unlock balance detected!
[   31.493576] 5.17.0-rc2+ #13 Tainted: G         C  E
[   31.493581] -------------------------------------
[   31.493584] bluetoothd/685 is trying to release lock (&hdev->lock) at:
[   31.493594] [<ffffffffc07603f5>] set_device_flags+0x65/0x1f0 [bluetooth]
[   31.493684] but there are no more locks to release!

Note this bug has been around for a couple of years, but before
commit fe92ee6425a2 ("Bluetooth: hci_core: Rework hci_conn_params flags")
supported_flags was hardcoded to "((1U << HCI_CONN_FLAG_MAX) - 1)" so
the check for unsupported flags which does the "goto done;" never
triggered.

Fixes: fe92ee6425a2 ("Bluetooth: hci_core: Rework hci_conn_params flags")
Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 net/bluetooth/mgmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

bluez.test.bot@gmail.com March 2, 2022, 2:09 p.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=619579

---Test result---

Test Summary:
CheckPatch                    PASS      1.68 seconds
GitLint                       PASS      0.97 seconds
SubjectPrefix                 PASS      0.85 seconds
BuildKernel                   PASS      36.20 seconds
BuildKernel32                 PASS      31.72 seconds
Incremental Build with patchesPASS      43.70 seconds
TestRunner: Setup             PASS      564.00 seconds
TestRunner: l2cap-tester      PASS      15.37 seconds
TestRunner: bnep-tester       PASS      7.22 seconds
TestRunner: mgmt-tester       PASS      117.53 seconds
TestRunner: rfcomm-tester     FAIL      9.09 seconds
TestRunner: sco-tester        PASS      8.99 seconds
TestRunner: smp-tester        PASS      8.92 seconds
TestRunner: userchan-tester   PASS      7.47 seconds

Details
##############################
Test: TestRunner: rfcomm-tester - FAIL - 9.09 seconds
Run test-runner with rfcomm-tester
Total: 10, Passed: 9 (90.0%), Failed: 1, Not Run: 0

Failed Test Cases
Basic RFCOMM Socket Client - Write 32k Success       Failed       0.188 seconds



---
Regards,
Linux Bluetooth
Hans de Goede March 2, 2022, 2:13 p.m. UTC | #2
Hi,

On 3/2/22 15:09, bluez.test.bot@gmail.com 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=619579
> 
> ---Test result---
> 
> Test Summary:
> CheckPatch                    PASS      1.68 seconds
> GitLint                       PASS      0.97 seconds
> SubjectPrefix                 PASS      0.85 seconds
> BuildKernel                   PASS      36.20 seconds
> BuildKernel32                 PASS      31.72 seconds
> Incremental Build with patchesPASS      43.70 seconds
> TestRunner: Setup             PASS      564.00 seconds
> TestRunner: l2cap-tester      PASS      15.37 seconds
> TestRunner: bnep-tester       PASS      7.22 seconds
> TestRunner: mgmt-tester       PASS      117.53 seconds
> TestRunner: rfcomm-tester     FAIL      9.09 seconds
> TestRunner: sco-tester        PASS      8.99 seconds
> TestRunner: smp-tester        PASS      8.92 seconds
> TestRunner: userchan-tester   PASS      7.47 seconds
> 
> Details
> ##############################
> Test: TestRunner: rfcomm-tester - FAIL - 9.09 seconds
> Run test-runner with rfcomm-tester
> Total: 10, Passed: 9 (90.0%), Failed: 1, Not Run: 0
> 
> Failed Test Cases
> Basic RFCOMM Socket Client - Write 32k Success       Failed       0.188 seconds

This seems like a false-positive failure, since I don't
see anyway how this patch can cause this issue.

Regards,

Hans
Marcel Holtmann March 2, 2022, 2:21 p.m. UTC | #3
Hi Hans,

> There is only one "goto done;" in set_device_flags() and this happens
> *before* hci_dev_lock() is called, move the done label to after the
> hci_dev_unlock() to fix the following unlock balance:
> 
> [   31.493567] =====================================
> [   31.493571] WARNING: bad unlock balance detected!
> [   31.493576] 5.17.0-rc2+ #13 Tainted: G         C  E
> [   31.493581] -------------------------------------
> [   31.493584] bluetoothd/685 is trying to release lock (&hdev->lock) at:
> [   31.493594] [<ffffffffc07603f5>] set_device_flags+0x65/0x1f0 [bluetooth]
> [   31.493684] but there are no more locks to release!
> 
> Note this bug has been around for a couple of years, but before
> commit fe92ee6425a2 ("Bluetooth: hci_core: Rework hci_conn_params flags")
> supported_flags was hardcoded to "((1U << HCI_CONN_FLAG_MAX) - 1)" so
> the check for unsupported flags which does the "goto done;" never
> triggered.
> 
> Fixes: fe92ee6425a2 ("Bluetooth: hci_core: Rework hci_conn_params flags")
> Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> net/bluetooth/mgmt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

patch has been applied to bluetooth-stable tree.

Regards

Marcel
Luiz Augusto von Dentz March 2, 2022, 7:13 p.m. UTC | #4
Hi Hans,

On Wed, Mar 2, 2022 at 8:52 AM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Hi,
>
> On 3/2/22 15:09, bluez.test.bot@gmail.com 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=619579
> >
> > ---Test result---
> >
> > Test Summary:
> > CheckPatch                    PASS      1.68 seconds
> > GitLint                       PASS      0.97 seconds
> > SubjectPrefix                 PASS      0.85 seconds
> > BuildKernel                   PASS      36.20 seconds
> > BuildKernel32                 PASS      31.72 seconds
> > Incremental Build with patchesPASS      43.70 seconds
> > TestRunner: Setup             PASS      564.00 seconds
> > TestRunner: l2cap-tester      PASS      15.37 seconds
> > TestRunner: bnep-tester       PASS      7.22 seconds
> > TestRunner: mgmt-tester       PASS      117.53 seconds
> > TestRunner: rfcomm-tester     FAIL      9.09 seconds
> > TestRunner: sco-tester        PASS      8.99 seconds
> > TestRunner: smp-tester        PASS      8.92 seconds
> > TestRunner: userchan-tester   PASS      7.47 seconds
> >
> > Details
> > ##############################
> > Test: TestRunner: rfcomm-tester - FAIL - 9.09 seconds
> > Run test-runner with rfcomm-tester
> > Total: 10, Passed: 9 (90.0%), Failed: 1, Not Run: 0
> >
> > Failed Test Cases
> > Basic RFCOMM Socket Client - Write 32k Success       Failed       0.188 seconds
>
> This seems like a false-positive failure, since I don't
> see anyway how this patch can cause this issue.

Its a known problem, CI is running against bluetooth-next.git while
the fix for this is on our stable bluetooth.git, once
bluetooth-next.git gets rebased this should go away.
diff mbox series

Patch

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 37087cf7dc5a..f05b9b73e84b 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4513,9 +4513,9 @@  static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,
 		}
 	}
 
-done:
 	hci_dev_unlock(hdev);
 
+done:
 	if (status == MGMT_STATUS_SUCCESS)
 		device_flags_changed(sk, hdev, &cp->addr.bdaddr, cp->addr.type,
 				     supported_flags, current_flags);