diff mbox series

[v1] Bluetooth: btintel: Fixe build regression

Message ID 20240223173819.973508-1-luiz.dentz@gmail.com
State New
Headers show
Series [v1] Bluetooth: btintel: Fixe build regression | expand

Commit Message

Luiz Augusto von Dentz Feb. 23, 2024, 5:38 p.m. UTC 
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_read_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(-)

Comments

Luiz Augusto von Dentz Feb. 23, 2024, 5:41 p.m. UTC | #1 
Hi Edward,


On Fri, Feb 23, 2024 at 12:38 PM 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_read_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, 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;
> --
> 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.
patchwork-bot+bluetooth@kernel.org Feb. 26, 2024, 3:10 p.m. UTC | #2 
Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Fri, 23 Feb 2024 12:38:18 -0500 you 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
> 
> [...]

Here is the summary with links:
  - [v1] Bluetooth: btintel: Fixe build regression
    https://git.kernel.org/bluetooth/bluetooth-next/c/cd41fa3056ab

You are awesome, thank you!
diff mbox series

Patch

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, 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;