Bluetooth: Fix endianness handling of cmd_status/complete opcodes
Subsystems (2)
PATCH 1/1 Bluetooth: Fix endianness handling of cmd_status/complete opcodes
From: Johan Hedberg <[email protected]>
The opcode in cmd_complete and cmd_status events is 16 bits, so we should only be comparing it after having converted it to the host endianness. There's already an opcode variable in both functions which is in host endiannes so the right fix is to just start using it instead of ev->opcode.
--- net/bluetooth/hci_event.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/bluetooth/hci_event.c +4 -4
@@ -2299,10 +2299,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)break ; } -if (ev->opcode !=HCI_OP_NOP ) +if (opcode !=HCI_OP_NOP )del_timer (&hdev->cmd_timer); -hci_req_cmd_complete (hdev, ev->opcode, status); +hci_req_cmd_complete (hdev, opcode, status);if (ev->ncmd && !test_bit (HCI_RESET , &hdev->flags)) {atomic_set (&hdev->cmd_cnt,1 );
@@ -2386,10 +2386,10 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)break ; } -if (ev->opcode !=HCI_OP_NOP ) +if (opcode !=HCI_OP_NOP )del_timer (&hdev->cmd_timer); -hci_req_cmd_status (hdev, ev->opcode, ev->status); +hci_req_cmd_status (hdev, opcode, ev->status);if (ev->ncmd && !test_bit (HCI_RESET , &hdev->flags)) {atomic_set (&hdev->cmd_cnt,1 );
Signature · 1 line
1.7.10.4
Hi Johan,
Quoted 8 lines · Johan Hedberg
From: Johan Hedberg <[email protected]>
The opcode in
cmd_completeandcmd_statusevents is 16 bits, so we should only be comparing it after having converted it to the host endianness. There's already an opcode variable in both functions which is in host endiannes so the right fix is to just start using it instead ofev->opcode.
Quoted 4 lines
Signed-off-by Johan Hedberg <[email protected]>--- net/bluetooth/hci_event.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Patch has been applied to bluetooth-next. Thanks.
Gustavo