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: c86c728 ("Bluetooth: btintel: Fix the legacy bootloader returns tlv based version") Fixes: 019a1ca ("Bluetooth: btintel: Refactoring setup routine for bootloader devices") Signed-off-by: Wang ShaoBo <[email protected]> Reviewed-by: Tedd Ho-Jeong An <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
kawasaki · Dec 12, 2022 · cee50ce · cee50ce
1 parent 50757a2
commit cee50ce
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
@@ -2524,7 +2524,7 @@ static int btintel_setup_combined(struct hci_dev *hdev)
 		 */
 		err = btintel_read_version(hdev, &ver);
 		if (err)
-			return err;
+			break;
 
 		/* Apply the device specific HCI quirks
 		 *
@@ -2566,7 +2566,8 @@ static int btintel_setup_combined(struct hci_dev *hdev)
 	default:
 		bt_dev_err(hdev, "Unsupported Intel hw variant (%u)",
 			   INTEL_HW_VARIANT(ver_tlv.cnvi_bt));
-		return -EINVAL;
+		err = -EINVAL;
+		break;
 	}
 
 exit_error: