Commit 1ed8b37c authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci_sync: fix memory leak in hci_update_adv_data() 



When hci_cmd_sync_queue() failed in hci_update_adv_data(), inst_ptr is
not freed, which will cause memory leak, convert to use ERR_PTR/PTR_ERR
to pass the instance to callback so no memory needs to be allocated.

Fixes: 651cd3d6 ("Bluetooth: convert hci_update_adv_data to hci_sync")
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 272970be

net/bluetooth/hci_sync.c

+3 −10
Original line number Diff line number Diff line
@@ -6187,20 +6187,13 @@ 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;



	*inst_ptr = instance;

	return hci_cmd_sync_queue(hdev, _update_adv_data_sync, inst_ptr, NULL);

	return hci_cmd_sync_queue(hdev, _update_adv_data_sync,

				  ERR_PTR(instance), NULL);

}