2020-01-08 04:04:17

by Wei Yongjun

Subject: [PATCH -next] Bluetooth: hci_qca: Use vfree() instead of kfree()

Use vfree() instead of kfree() to free vmalloc()
allocated data.

Fixes: d841502c79e3 ("Bluetooth: hci_qca: Collect controller memory dump during SSR")
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/bluetooth/hci_qca.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 9392cc7f9908..a17260641283 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -529,7 +529,7 @@ static void hci_memdump_timeout(struct timer_list *t)
bt_dev_err(hu->hdev, "clearing allocated memory due to memdump timeout");
/* Inject hw error event to reset the device and driver. */
hci_reset_dev(hu->hdev);
- kfree(memdump_buf);
+ vfree(memdump_buf);
kfree(qca_memdump);
qca->memdump_state = QCA_MEMDUMP_TIMEOUT;
del_timer(&qca->memdump_timer);
@@ -1437,7 +1437,7 @@ static void qca_wait_for_dump_collection(struct hci_dev *hdev)
bt_dev_err(hu->hdev, "Clearing the buffers due to timeout");
if (qca_memdump)
memdump_buf = qca_memdump->memdump_buf_tail;
- kfree(memdump_buf);
+ vfree(memdump_buf);
kfree(qca_memdump);
qca->memdump_state = QCA_MEMDUMP_TIMEOUT;
del_timer(&qca->memdump_timer);

2020-01-08 12:32:48

by Balakrishna Godavarthi

Subject: Re: [PATCH -next] Bluetooth: hci_qca: Use vfree() instead of kfree()

On 2020-01-08 09:29, Wei Yongjun wrote:
> Use vfree() instead of kfree() to free vmalloc()
> allocated data.
>
> Fixes: d841502c79e3 ("Bluetooth: hci_qca: Collect controller memory
> dump during SSR")
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/bluetooth/hci_qca.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index 9392cc7f9908..a17260641283 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -529,7 +529,7 @@ static void hci_memdump_timeout(struct timer_list
> *t)
> bt_dev_err(hu->hdev, "clearing allocated memory due to memdump
> timeout");
> /* Inject hw error event to reset the device and driver. */
> hci_reset_dev(hu->hdev);
> - kfree(memdump_buf);
> + vfree(memdump_buf);
> kfree(qca_memdump);
> qca->memdump_state = QCA_MEMDUMP_TIMEOUT;
> del_timer(&qca->memdump_timer);
> @@ -1437,7 +1437,7 @@ static void qca_wait_for_dump_collection(struct
> hci_dev *hdev)
> bt_dev_err(hu->hdev, "Clearing the buffers due to timeout");
> if (qca_memdump)
> memdump_buf = qca_memdump->memdump_buf_tail;
> - kfree(memdump_buf);
> + vfree(memdump_buf);
> kfree(qca_memdump);
> qca->memdump_state = QCA_MEMDUMP_TIMEOUT;
> del_timer(&qca->memdump_timer);

Reviewed-by: Balakrishna Godavarthi <[email protected]>

2020-01-08 20:46:48

by Marcel Holtmann

Subject: Re: [PATCH -next] Bluetooth: hci_qca: Use vfree() instead of kfree()

Hi Wei,

> Use vfree() instead of kfree() to free vmalloc()
> allocated data.
>
> Fixes: d841502c79e3 ("Bluetooth: hci_qca: Collect controller memory dump during SSR")
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/bluetooth/hci_qca.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel