2024-02-23 17:40:32

by Luiz Augusto von Dentz

Subject: [PATCH v1] Bluetooth: btintel: Fixe build regression

From: Luiz Augusto von Dentz <[email protected]>

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 <[email protected]>
---
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

2024-02-23 17:42:07

by Luiz Augusto von Dentz

Subject: Re: [PATCH v1] Bluetooth: btintel: Fixe build regression

Hi Edward,


On Fri, Feb 23, 2024 at 12:38 PM Luiz Augusto von Dentz
<[email protected]> wrote:
>
> From: Luiz Augusto von Dentz <[email protected]>
>
> 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 <[email protected]>
> ---
> 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.

--
Luiz Augusto von Dentz

2024-02-26 15:29:40

by patchwork-bot+bluetooth

Subject: Re: [PATCH v1] Bluetooth: btintel: Fixe build regression

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[email protected]>:

On Fri, 23 Feb 2024 12:38:18 -0500 you wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> 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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html