* [PATCH v2] Bluetooth: hci_sync: fix memory leak in hci_update_adv_data()
@ 2023-01-10 6:44 Zhengchao Shao
2023-01-10 7:05 ` shaozhengchao
0 siblings, 1 reply; 2+ messages in thread
From: Zhengchao Shao @ 2023-01-10 6:44 UTC (permalink / raw)
To: linux-bluetooth, netdev, marcel, johan.hedberg, luiz.dentz,
davem, edumazet, kuba, pabeni
Cc: brian.gix, weiyongjun1, yuehaibing, shaozhengchao
When hci_cmd_sync_queue() failed in hci_update_adv_data(), inst_ptr is
not freed, which will cause memory leak. ERR_PTR/PTR_ERR is used to
replace memory allocation to simplify code.
Fixes: 651cd3d65b0f ("Bluetooth: convert hci_update_adv_data to hci_sync")
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
v2: Use ERR_PTR/PTR_ERR to replace memory allocation
---
net/bluetooth/hci_sync.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 9e2d7e4b850c..8744bbecac9e 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -6187,20 +6187,14 @@ int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,
static int _update_adv_data_sync(struct hci_dev *hdev, void *data)
{
- u8 instance = *(u8 *)data;
-
- kfree(data);
+ u8 instance = PTR_ERR(data);
return hci_update_adv_data_sync(hdev, instance);
}
int hci_update_adv_data(struct hci_dev *hdev, u8 instance)
{
- u8 *inst_ptr = kmalloc(1, GFP_KERNEL);
-
- if (!inst_ptr)
- return -ENOMEM;
+ u8 *inst_ptr = ERR_PTR(instance);
- *inst_ptr = instance;
return hci_cmd_sync_queue(hdev, _update_adv_data_sync, inst_ptr, NULL);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] Bluetooth: hci_sync: fix memory leak in hci_update_adv_data()
2023-01-10 6:44 [PATCH v2] Bluetooth: hci_sync: fix memory leak in hci_update_adv_data() Zhengchao Shao
@ 2023-01-10 7:05 ` shaozhengchao
0 siblings, 0 replies; 2+ messages in thread
From: shaozhengchao @ 2023-01-10 7:05 UTC (permalink / raw)
To: linux-bluetooth, netdev, marcel, johan.hedberg, luiz.dentz,
davem, edumazet, kuba, pabeni
Cc: brian.gix, weiyongjun1, yuehaibing
Sorry for Repeatedly senting. Please ignore this patch.
On 2023/1/10 14:44, Zhengchao Shao wrote:
> When hci_cmd_sync_queue() failed in hci_update_adv_data(), inst_ptr is
> not freed, which will cause memory leak. ERR_PTR/PTR_ERR is used to
> replace memory allocation to simplify code.
>
> Fixes: 651cd3d65b0f ("Bluetooth: convert hci_update_adv_data to hci_sync")
> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
> ---
> v2: Use ERR_PTR/PTR_ERR to replace memory allocation
> ---
> net/bluetooth/hci_sync.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
> index 9e2d7e4b850c..8744bbecac9e 100644
> --- a/net/bluetooth/hci_sync.c
> +++ b/net/bluetooth/hci_sync.c
> @@ -6187,20 +6187,14 @@ int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,
>
> static int _update_adv_data_sync(struct hci_dev *hdev, void *data)
> {
> - u8 instance = *(u8 *)data;
> -
> - kfree(data);
> + u8 instance = PTR_ERR(data);
>
> return hci_update_adv_data_sync(hdev, instance);
> }
>
> int hci_update_adv_data(struct hci_dev *hdev, u8 instance)
> {
> - u8 *inst_ptr = kmalloc(1, GFP_KERNEL);
> -
> - if (!inst_ptr)
> - return -ENOMEM;
> + u8 *inst_ptr = ERR_PTR(instance);
>
> - *inst_ptr = instance;
> return hci_cmd_sync_queue(hdev, _update_adv_data_sync, inst_ptr, NULL);
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-10 7:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-10 6:44 [PATCH v2] Bluetooth: hci_sync: fix memory leak in hci_update_adv_data() Zhengchao Shao
2023-01-10 7:05 ` shaozhengchao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).