diff options
Diffstat (limited to 'Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch')
| -rw-r--r-- | Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch b/Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch index 469213c9bb85..67ec57c5a511 100644 --- a/Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch +++ b/Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch @@ -1,7 +1,7 @@ -From 79a6a06eaac891858a2f41a6a63d75c7d00cbf04 Mon Sep 17 00:00:00 2001 +From 4e694320c993c1172cacce8add0735cc228d2231 Mon Sep 17 00:00:00 2001 From: Kiran K <kiran.k@intel.com> Date: Wed, 13 Oct 2021 13:35:11 +0530 -Subject: [PATCH 3/3] Bluetooth: btintel: Fix bdaddress comparison with garbage +Subject: [PATCH 2/3] Bluetooth: btintel: Fix bdaddress comparison with garbage value Intel Read Verision(TLV) data is parsed into a local structure variable @@ -11,15 +11,17 @@ only if controller is present in boot loader mode. Signed-off-by: Kiran K <kiran.k@intel.com> Reviewed-by: Tedd Ho-Jeong An <tedd.an@intel.com> +Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +(cherry picked from commit 893505319c74cf3faa45a5ed9d5338ff03b66949) --- drivers/bluetooth/btintel.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c -index f1705b46fc88..b9055a3e61ed 100644 +index 851a0c9b8fae..1a4f8b227eac 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c -@@ -2006,14 +2006,16 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev, +@@ -2081,14 +2081,16 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev, if (ver->img_type == 0x03) { btintel_clear_flag(hdev, INTEL_BOOTLOADER); btintel_check_bdaddr(hdev); @@ -44,7 +46,7 @@ index f1705b46fc88..b9055a3e61ed 100644 } btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi"); -@@ -2303,6 +2305,10 @@ static int btintel_setup_combined(struct hci_dev *hdev) +@@ -2467,6 +2469,10 @@ static int btintel_setup_combined(struct hci_dev *hdev) goto exit_error; } @@ -56,5 +58,5 @@ index f1705b46fc88..b9055a3e61ed 100644 err = btintel_parse_version_tlv(hdev, &ver_tlv, skb); if (err) { -- -2.34.1 +2.35.0 |