From: Colin Ian King <colin.king@canonical.com>
Date: Tue, 10 Nov 2020 12:39:15 +0000 (+0000)
Subject: Bluetooth: btrtl: fix incorrect skb allocation failure check
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f5e8e215869eed6163d5fdd309f0e674a0f23df6;p=linux.git

Bluetooth: btrtl: fix incorrect skb allocation failure check

Currently the check for a failed bt_skb_alloc allocation is incorrectly
checking using IS_ERR and this can lead to a null pointer dereference. Fix
this by checking for a null pointer return using the !skb idiom.

Addresses-Coverity: ("Dereference null return")
Fixes: 1996d9cad6ad ("Bluetooth: btrtl: Ask 8821C to drop old firmware")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index e47736a12f770..a4f7cace66b06 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -581,7 +581,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
 		cmd[1] = opcode >> 8;
 
 		skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);
-		if (IS_ERR(skb))
+		if (!skb)
 			goto out_free;
 
 		skb_put_data(skb, cmd, sizeof(cmd));