]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Bluetooth: btintel: Fixe build regression
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Fri, 23 Feb 2024 17:36:23 +0000 (12:36 -0500)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 6 Mar 2024 22:26:10 +0000 (17:26 -0500)
This fixes the following build regression:

drivers-bluetooth-btintel.c-btintel_read_version()-warn:
passing-zero-to-PTR_ERR

Fixes: b79e04091010 ("Bluetooth: btintel: Fix null ptr deref in btintel_read_version")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
drivers/bluetooth/btintel.c

index a083c4b8621c59c3df5fcc3c2ee97e181816d927..6ba7f5d1b837f5e11d0b73094e26f875f1a2f920 100644 (file)
@@ -435,13 +435,13 @@ int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver)
        struct sk_buff *skb;
 
        skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_CMD_TIMEOUT);
-       if (IS_ERR_OR_NULL(skb)) {
+       if (IS_ERR(skb)) {
                bt_dev_err(hdev, "Reading Intel version information failed (%ld)",
                           PTR_ERR(skb));
                return PTR_ERR(skb);
        }
 
-       if (skb->len != sizeof(*ver)) {
+       if (!skb || skb->len != sizeof(*ver)) {
                bt_dev_err(hdev, "Intel version event size mismatch");
                kfree_skb(skb);
                return -EILSEQ;