linux-kernel - Re: [PATCH] Bluetooth: btrtl: Add null check in setup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <2CD614F7-0E7D-4BC2-AF81-50A1962DC760@holtmann.org>
Date:   Wed, 23 Dec 2020 07:22:06 +0100
From:   Marcel Holtmann <marcel@...tmann.org>
To:     Abhishek Pandit-Subedi <abhishekpandit@...omium.org>
Cc:     CrosBT Upstreaming <chromeos-bluetooth-upstreaming@...omium.org>,
        linux-bluetooth <linux-bluetooth@...r.kernel.org>,
        Johan Hedberg <johan.hedberg@...il.com>,
        Daniel Winkler <danielwinkler@...gle.com>,
        LKML <linux-kernel@...r.kernel.org>,
        Luiz Augusto von Dentz <luiz.dentz@...il.com>
Subject: Re: [PATCH] Bluetooth: btrtl: Add null check in setup

Hi Abhishek,

> btrtl_dev->ic_info is only available from the controller on cold boot
> (the lmp subversion matches the device model and this is used to look up
> the ic_info). On warm boots (firmware already loaded),
> btrtl_dev->ic_info is null.
> 
> Fixes: 05672a2c14a4 (Bluetooth: btrtl: Enable central-peripheral role)
> Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@...omium.org>
> ---
> 
> drivers/bluetooth/btrtl.c | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
> index 1abf6a4d672734f..978f3c773856b05 100644
> --- a/drivers/bluetooth/btrtl.c
> +++ b/drivers/bluetooth/btrtl.c
> @@ -719,16 +719,19 @@ int btrtl_setup_realtek(struct hci_dev *hdev)
> 	 */
> 	set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
> 
> -	/* Enable central-peripheral role (able to create new connections with
> -	 * an existing connection in slave role).
> -	 */
> -	switch (btrtl_dev->ic_info->lmp_subver) {
> -	case RTL_ROM_LMP_8822B:
> -		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);
> -		break;
> -	default:
> -		rtl_dev_dbg(hdev, "Central-peripheral role not enabled.");
> -		break;
> +	if (btrtl_dev->ic_info) {
> +		/* Enable central-peripheral role (able to create new
> +		 * connections with an existing connection in slave role).
> +		 */
> +		switch (btrtl_dev->ic_info->lmp_subver) {
> +		case RTL_ROM_LMP_8822B:
> +			set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);
> +			break;
> +		default:
> +			rtl_dev_dbg(hdev,
> +				    "Central-peripheral role not enabled.");
> +			break;
> +		}
> 	}


	if (!btrtl_dev->ic_info)
		goto done;

> 
> 	btrtl_free(btrtl_dev);

Regards

Marcel