2017-05-22 13:50:42

by Guodong Xu

Subject: [PATCH] Bluetooth: hci_ll: Fix download_firmware() return when __hci_cmd_sync fails

When __hci_cmd_sync() fails, download_firmware() should also fail, and
the same error value should be returned as PTR_ERR(skb).

Without this fix, download_firmware() will return a success when it actually
failed in __hci_cmd_sync().

Fixes: 371805522f87 ("bluetooth: hci_uart: add LL protocol serdev driver support")
Signed-off-by: Guodong Xu <[email protected]>
---
drivers/bluetooth/hci_ll.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index adc444f..200288c 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -624,6 +624,7 @@ static int download_firmware(struct ll_device *lldev)
skb = __hci_cmd_sync(lldev->hu.hdev, cmd->opcode, cmd->plen, &cmd->speed, HCI_INIT_TIMEOUT);
if (IS_ERR(skb)) {
bt_dev_err(lldev->hu.hdev, "send command failed\n");
+ err = PTR_ERR(skb);
goto out_rel_fw;
}
kfree_skb(skb);
--
2.10.2

2017-05-23 14:18:53

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: hci_ll: Fix download_firmware() return when __hci_cmd_sync fails

Hi Guodong,

> When __hci_cmd_sync() fails, download_firmware() should also fail, and
> the same error value should be returned as PTR_ERR(skb).
>
> Without this fix, download_firmware() will return a success when it actually
> failed in __hci_cmd_sync().
>
> Fixes: 371805522f87 ("bluetooth: hci_uart: add LL protocol serdev driver support")
> Signed-off-by: Guodong Xu <[email protected]>
> ---
> drivers/bluetooth/hci_ll.c | 1 +
> 1 file changed, 1 insertion(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel

2017-05-23 13:45:07

by Rob Herring (Arm)

Subject: Re: [PATCH] Bluetooth: hci_ll: Fix download_firmware() return when __hci_cmd_sync fails

On Mon, May 22, 2017 at 8:50 AM, Guodong Xu <[email protected]> wrote:
> When __hci_cmd_sync() fails, download_firmware() should also fail, and
> the same error value should be returned as PTR_ERR(skb).
>
> Without this fix, download_firmware() will return a success when it actually
> failed in __hci_cmd_sync().
>
> Fixes: 371805522f87 ("bluetooth: hci_uart: add LL protocol serdev driver support")
> Signed-off-by: Guodong Xu <[email protected]>
> ---
> drivers/bluetooth/hci_ll.c | 1 +
> 1 file changed, 1 insertion(+)

Acked-by: Rob Herring <[email protected]>