Commit fb553d24 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by sanglipeng1
Browse files

Bluetooth: btintel: Fixe build regression 

stable inclusion
from stable-v5.10.215
commit f7d846acf91b40ef507ecf8affb03e4cf662ddee
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJJ2D

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f7d846acf91b40ef507ecf8affb03e4cf662ddee



--------------------------------

commit 6e62ebfb49eb65bdcbfc5797db55e0ce7f79c3dd upstream.

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: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 3c980cb8

drivers/bluetooth/btintel.c

+2 −2
Original line number Diff line number Diff line
@@ -344,13 +344,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;