Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <cbe1d2ae745ae380d2819877bb07e5cc8ba56c44.camel@gmail.com>
Subject: Re: [PATCH v1] Bluetooth: btintel: Fix bdaddress comparison with
 garbage value
From:   Tedd Ho-Jeong An <hj.tedd.an@gmail.com>
To:     Kiran K <kiran.k@intel.com>, linux-bluetooth@vger.kernel.org
Cc:     ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com,
        tedd.an@intel.com
Date:   Tue, 05 Oct 2021 21:14:20 -0700
In-Reply-To: <20211005042613.9946-1-kiran.k@intel.com>
References: <20211005042613.9946-1-kiran.k@intel.com>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.36.5-0ubuntu1 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Tue, 2021-10-05 at 09:56 +0530, Kiran K wrote:
> Intel Read Verision(TLV) data is parsed into a local structure
> variable
> and it contains a field for bd address. Bd address is returned only
> in
> bootloader mode and hence bd address in TLV structure needs to be
> validated
> only if controller is present in boot loader mode.
> 

Reviewed-by: Tedd Ho-Jeong An <tedd.an@intel.com>

> Signed-off-by: Kiran K <kiran.k@intel.com>
> ---
>  drivers/bluetooth/btintel.c | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/bluetooth/btintel.c
> b/drivers/bluetooth/btintel.c
> index 9359bff47296..d1703cc99705 100644
> --- a/drivers/bluetooth/btintel.c
> +++ b/drivers/bluetooth/btintel.c
> @@ -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);
> -	}
> -
> -	/* If the OTP has no valid Bluetooth device address, then there
> will
> -	 * also be no valid address for the operational firmware.
> -	 */
> -	if (!bacmp(&ver->otp_bd_addr, BDADDR_ANY)) {
> -		bt_dev_info(hdev, "No device address configured");
> -		set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
> +	} else {
> +		/*
> +		 * Check for valid bd address in boot loader mode.
> Device
> +		 * will be marked as unconfigured if empty bd address
> is
> +		 * found.
> +		 */
> +		if (!bacmp(&ver->otp_bd_addr, BDADDR_ANY)) {
> +			bt_dev_info(hdev, "No device address
> configured");
> +			set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev-
> >quirks);
> +		}
>  	}
>  
>  	btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi");
> @@ -2466,6 +2468,7 @@ static int btintel_setup_combined(struct
> hci_dev *hdev)
>  		goto exit_error;
>  	}
>  
> +	memset(&ver_tlv, 0, sizeof(ver_tlv));
>  	/* For TLV type device, parse the tlv data */
>  	err = btintel_parse_version_tlv(hdev, &ver_tlv, skb);
>  	if (err) {