]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Bluetooth: btrtl: check for NULL in btrtl_setup_realtek()
authorMax Chou <max.chou@realtek.com>
Tue, 31 Dec 2024 06:57:19 +0000 (14:57 +0800)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 15 Jan 2025 15:34:41 +0000 (10:34 -0500)
If insert an USB dongle which chip is not maintained in ic_id_table, it
will hit the NULL point accessed. Add a null point check to avoid the
Kernel Oops.

Fixes: b39910bb54d9 ("Bluetooth: Populate hci_set_hw_info for Intel and Realtek")
Reviewed-by: Alex Lu <alex_lu@realsil.com.cn>
Signed-off-by: Max Chou <max.chou@realtek.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
drivers/bluetooth/btrtl.c

index 83025f457ca044a30d7837f29b1b341b68df565b..d3eba0d4a57d3b5e6218d84e20bb061661ab11a4 100644 (file)
@@ -1351,12 +1351,14 @@ int btrtl_setup_realtek(struct hci_dev *hdev)
 
        btrtl_set_quirks(hdev, btrtl_dev);
 
-       hci_set_hw_info(hdev,
+       if (btrtl_dev->ic_info) {
+               hci_set_hw_info(hdev,
                        "RTL lmp_subver=%u hci_rev=%u hci_ver=%u hci_bus=%u",
                        btrtl_dev->ic_info->lmp_subver,
                        btrtl_dev->ic_info->hci_rev,
                        btrtl_dev->ic_info->hci_ver,
                        btrtl_dev->ic_info->hci_bus);
+       }
 
        btrtl_free(btrtl_dev);
        return ret;