OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bluetooth: hci_sync: Don't double print name in add/remove adv_monitor 

[ Upstream commit 6f55eea116 ]

The hci_add_adv_monitor() hci_remove_adv_monitor() functions call
bt_dev_dbg() to print some debug statements. The bt_dev_dbg() macro
automatically adds in the device's name. That means that we shouldn't
include the name in the bt_dev_dbg() calls.

Suggested-by: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Stable-dep-of: a2bcd2b632 ("Bluetooth: hci_sync: Avoid use-after-free in dbg for hci_add_adv_monitor()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Douglas Anderson 2023-06-30 15:33:15 -07:00 committed by Greg Kroah-Hartman
parent 94617b736c
commit bd39b55240
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/bluetooth/hci_core.c
View File

@ -1949,14 +1949,14 @@ int hci_add_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor)
switch (hci_get_adv_monitor_offload_ext(hdev)) { switch (hci_get_adv_monitor_offload_ext(hdev)) {
case HCI_ADV_MONITOR_EXT_NONE: case HCI_ADV_MONITOR_EXT_NONE:
bt_dev_dbg(hdev, "%s add monitor %d status %d", hdev->name, bt_dev_dbg(hdev, "add monitor %d status %d",
monitor->handle, status); monitor->handle, status);
/* Message was not forwarded to controller - not an error */ /* Message was not forwarded to controller - not an error */
break; break;
case HCI_ADV_MONITOR_EXT_MSFT: case HCI_ADV_MONITOR_EXT_MSFT:
status = msft_add_monitor_pattern(hdev, monitor); status = msft_add_monitor_pattern(hdev, monitor);
bt_dev_dbg(hdev, "%s add monitor %d msft status %d", hdev->name, bt_dev_dbg(hdev, "add monitor %d msft status %d",
monitor->handle, status); monitor->handle, status);
break; break;
} }
@ -1976,15 +1976,15 @@ static int hci_remove_adv_monitor(struct hci_dev *hdev,
switch (hci_get_adv_monitor_offload_ext(hdev)) { switch (hci_get_adv_monitor_offload_ext(hdev)) {
case HCI_ADV_MONITOR_EXT_NONE: /* also goes here when powered off */ case HCI_ADV_MONITOR_EXT_NONE: /* also goes here when powered off */
bt_dev_dbg(hdev, "%s remove monitor %d status %d", hdev->name, bt_dev_dbg(hdev, "remove monitor %d status %d",
monitor->handle, status); monitor->handle, status);
goto free_monitor; goto free_monitor;
case HCI_ADV_MONITOR_EXT_MSFT: case HCI_ADV_MONITOR_EXT_MSFT:
handle = monitor->handle; handle = monitor->handle;
status = msft_remove_monitor(hdev, monitor); status = msft_remove_monitor(hdev, monitor);
bt_dev_dbg(hdev, "%s remove monitor %d msft status %d", bt_dev_dbg(hdev, "remove monitor %d msft status %d",
hdev->name, handle, status); handle, status);
break; break;
} }