Commit cee50ce8 authored by Wang ShaoBo's avatar Wang ShaoBo Committed by Luiz Augusto von Dentz

Bluetooth: btintel: Fix missing free skb in btintel_setup_combined()

skb allocated by __hci_cmd_sync would not be used whether in checking
for supported iBT hardware variants or after, we should free it in all
error branches, this patch makes the case read version failed or default
error case free skb before return.

Fixes: c86c7285 ("Bluetooth: btintel: Fix the legacy bootloader returns tlv based version")
Fixes: 019a1caa ("Bluetooth: btintel: Refactoring setup routine for bootloader devices")
Signed-off-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Reviewed-by: default avatarTedd Ho-Jeong An <tedd.an@intel.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 50757a25
...@@ -2524,7 +2524,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) ...@@ -2524,7 +2524,7 @@ static int btintel_setup_combined(struct hci_dev *hdev)
*/ */
err = btintel_read_version(hdev, &ver); err = btintel_read_version(hdev, &ver);
if (err) if (err)
return err; break;
/* Apply the device specific HCI quirks /* Apply the device specific HCI quirks
* *
...@@ -2566,7 +2566,8 @@ static int btintel_setup_combined(struct hci_dev *hdev) ...@@ -2566,7 +2566,8 @@ static int btintel_setup_combined(struct hci_dev *hdev)
default: default:
bt_dev_err(hdev, "Unsupported Intel hw variant (%u)", bt_dev_err(hdev, "Unsupported Intel hw variant (%u)",
INTEL_HW_VARIANT(ver_tlv.cnvi_bt)); INTEL_HW_VARIANT(ver_tlv.cnvi_bt));
return -EINVAL; err = -EINVAL;
break;
} }
exit_error: exit_error:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment