Bluetooth: hci_event: fix Set CIG Parameters error status handling

Commit Message

Pauli Virtanen June 2, 2023, 9:28 p.m. UTC

If the event has error status, return right error code and don't show
incorrect "response malformed" messages.

Signed-off-by: Pauli Virtanen <[e-mail]>
---

Notes:
    Correction to
    "Bluetooth: ISO: use correct CIS order in Set CIG Parameters event"

 net/bluetooth/hci_event.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

[e-mail] June 2, 2023, 9:59 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=753675

---Test result---

Test Summary:
CheckPatch                    PASS      0.67 seconds
GitLint                       PASS      0.32 seconds
SubjectPrefix                 PASS      0.11 seconds
BuildKernel                   PASS      35.49 seconds
CheckAllWarning               PASS      38.63 seconds
CheckSparse                   WARNING   44.13 seconds
CheckSmatch                   WARNING   119.45 seconds
BuildKernel32                 PASS      34.45 seconds
TestRunnerSetup               PASS      504.55 seconds
TestRunner_l2cap-tester       PASS      19.10 seconds
TestRunner_iso-tester         PASS      26.91 seconds
TestRunner_bnep-tester        PASS      6.74 seconds
TestRunner_mgmt-tester        PASS      130.53 seconds
TestRunner_rfcomm-tester      PASS      10.60 seconds
TestRunner_sco-tester         PASS      9.67 seconds
TestRunner_ioctl-tester       PASS      11.45 seconds
TestRunner_mesh-tester        PASS      8.50 seconds
TestRunner_smp-tester         PASS      9.65 seconds
TestRunner_userchan-tester    PASS      7.02 seconds
IncrementalBuild              PASS      34.68 seconds

Details
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):


---
Regards,
Linux Bluetooth

[e-mail] June 3, 2023, 12:30 a.m. UTC | #2

Hello:

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

On Sat,  3 Jun 2023 00:28:12 +0300 you wrote:
> If the event has error status, return right error code and don't show
> incorrect "response malformed" messages.
> 
> Signed-off-by: Pauli Virtanen <[e-mail]>
> ---
> 
> Notes:
>     Correction to
>     "Bluetooth: ISO: use correct CIS order in Set CIG Parameters event"
> 
> [...]

Here is the summary with links:
  - Bluetooth: hci_event: fix Set CIG Parameters error status handling
    https://git.kernel.org/bluetooth/bluetooth-next/c/280ae657262d

You are awesome, thank you!

Patch

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index b3825b3f06d9..7c199f7361f7 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3813,7 +3813,8 @@  static u8 hci_cc_le_set_cig_params(struct hci_dev *hdev, void *data,
 	bt_dev_dbg(hdev, "status 0x%2.2x", rp->status);
 
 	cp = hci_sent_cmd_data(hdev, HCI_OP_LE_SET_CIG_PARAMS);
-	if (!cp || rp->num_handles != cp->num_cis || rp->cig_id != cp->cig_id) {
+	if (!rp->status && (!cp || rp->num_handles != cp->num_cis ||
+			    rp->cig_id != cp->cig_id)) {
 		bt_dev_err(hdev, "unexpected Set CIG Parameters response data");
 		status = HCI_ERROR_UNSPECIFIED;
 	}