releases/4.19.312/bluetooth-btintel-fixe-build-regression.patch

   1 From 6e62ebfb49eb65bdcbfc5797db55e0ce7f79c3dd Mon Sep 17 00:00:00 2001
   2 From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
   3 Date: Fri, 23 Feb 2024 12:36:23 -0500
   4 Subject: Bluetooth: btintel: Fixe build regression
   5
   6 From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
   7
   8 commit 6e62ebfb49eb65bdcbfc5797db55e0ce7f79c3dd upstream.
   9
  10 This fixes the following build regression:
  11
  12 drivers-bluetooth-btintel.c-btintel_read_version()-warn:
  13 passing-zero-to-PTR_ERR
  14
  15 Fixes: b79e04091010 ("Bluetooth: btintel: Fix null ptr deref in btintel_read_version")
  16 Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18 ---
  19  drivers/bluetooth/btintel.c |    4 ++--
  20  1 file changed, 2 insertions(+), 2 deletions(-)
  21
  22 --- a/drivers/bluetooth/btintel.c
  23 +++ b/drivers/bluetooth/btintel.c
  24 @@ -355,13 +355,13 @@ int btintel_read_version(struct hci_dev
  25         struct sk_buff *skb;
  26
  27         skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_CMD_TIMEOUT);
  28 -       if (IS_ERR_OR_NULL(skb)) {
  29 +       if (IS_ERR(skb)) {
  30                 bt_dev_err(hdev, "Reading Intel version information failed (%ld)",
  31                            PTR_ERR(skb));
  32                 return PTR_ERR(skb);
  33         }
  34
  35 -       if (skb->len != sizeof(*ver)) {
  36 +       if (!skb || skb->len != sizeof(*ver)) {
  37                 bt_dev_err(hdev, "Intel version event size mismatch");
  38                 kfree_skb(skb);
  39                 return -EILSEQ;