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

[ Upstream commit 6f55eea116ba3646fb5fbb31de703f8cf79d8214 ]

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: a2bcd2b63271 ("Bluetooth: hci_sync: Avoid use-after-free in dbg for hci_add_adv_monitor()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 2688444..561e8a7 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -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)) {
        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);
                /* Message was not forwarded to controller - not an error */
                break;
 
        case HCI_ADV_MONITOR_EXT_MSFT:
                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);
                break;
        }
@@ -1976,15 +1976,15 @@ static int hci_remove_adv_monitor(struct hci_dev *hdev,
 
        switch (hci_get_adv_monitor_offload_ext(hdev)) {
        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);
                goto free_monitor;
 
        case HCI_ADV_MONITOR_EXT_MSFT:
                handle = monitor->handle;
                status = msft_remove_monitor(hdev, monitor);
-               bt_dev_dbg(hdev, "%s remove monitor %d msft status %d",
-                          hdev->name, handle, status);
+               bt_dev_dbg(hdev, "remove monitor %d msft status %d",
+                          handle, status);
                break;
        }