Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-2127-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240223173819.973508-1-luiz.dentz@gmail.com>
In-Reply-To: <20240223173819.973508-1-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date: Fri, 23 Feb 2024 12:41:43 -0500
Message-ID: <CABBYNZJMvyDFjcXGMc80d_XSEpOefzvK+=T-r=OF5MhXZakhLA@mail.gmail.com>
Subject: Re: [PATCH v1] Bluetooth: btintel: Fixe build regression
To: linux-bluetooth@vger.kernel.org
Cc: Edward Adam Davis <eadavis@qq.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Edward,


On Fri, Feb 23, 2024 at 12:38=E2=80=AFPM Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
>
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> This fixes the following build regression:
>
> drivers-bluetooth-btintel.c-btintel_read_version()-warn:
> passing-zero-to-PTR_ERR
>
> Fixes: 36618e0d5a6d ("Bluetooth: btintel: Fix null ptr deref in btintel_r=
ead_version")
> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> ---
>  drivers/bluetooth/btintel.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
> index a083c4b8621c..6ba7f5d1b837 100644
> --- a/drivers/bluetooth/btintel.c
> +++ b/drivers/bluetooth/btintel.c
> @@ -435,13 +435,13 @@ int btintel_read_version(struct hci_dev *hdev, stru=
ct intel_version *ver)
>         struct sk_buff *skb;
>
>         skb =3D __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 faile=
d (%ld)",
>                            PTR_ERR(skb));
>                 return PTR_ERR(skb);
>         }
>
> -       if (skb->len !=3D sizeof(*ver)) {
> +       if (!skb || skb->len !=3D sizeof(*ver)) {
>                 bt_dev_err(hdev, "Intel version event size mismatch");
>                 kfree_skb(skb);
>                 return -EILSEQ;
> --
> 2.43.0

Looks like your change 36618e0d5a6d ("Bluetooth: btintel: Fix null ptr
deref in btintel_read_version") caused this build regression thus Im
CCing you just to confirm that reverting it and checking alongside the
len shall resolve the initial problem you were trying to fix.

--=20
Luiz Augusto von Dentz