Messages in this thread Patch in this message | | | From | Zumeng Chen <> | Subject | [PATCH 1/1 v2] Bluetooth: make the balance of judgement condition to fix a false report | Date | Thu, 15 Nov 2018 09:31:57 +0800 |
| |
This patch is to balance the condition scope between hci_get_cmd_complete and hci_event_packet about orig_skb as follows:
if (req_complete_skb || event == HCI_EV_CMD_STATUS || event == HCI_EV_CMD_COMPLETE) orig_skb = skb_clone(skb, GFP_KERNEL);
And hci_get_cmd_complete will bt_dev_err out when HCI_EV_CMD_STATUS, so a lot of asymmetric conditions are triggered. Since both of them are the entry into hci_get_cmd_complete, we'd better get STATUS into judge the false out there.
Signed-off-by: Zumeng Chen <zumeng.chen@gmail.com> ---
v2: remove redundant braces and adjust the indentation.
Cheers, Zumeng
net/bluetooth/hci_event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 235b5aa..1d2a8fe 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -5217,7 +5217,8 @@ static bool hci_get_cmd_complete(struct hci_dev *hdev, u16 opcode, return true; } - if (hdr->evt != HCI_EV_CMD_COMPLETE) { + if (!(hdr->evt == HCI_EV_CMD_COMPLETE || + hdr->evt == HCI_EV_CMD_STATUS)) { bt_dev_err(hdev, "last event is not cmd complete (0x%2.2x)", hdr->evt); return false; -- 2.7.4
| |