Bluetooth: Fix not cleanup led when bt_init fails

[ Upstream commit 2f3957c7eb4e07df944169a3e50a4d6790e1c744 ]

bt_init() calls bt_leds_init() to register led, but if it fails later,
bt_leds_cleanup() is not called to unregister it.

This can cause panic if the argument "bluetooth-power" in text is freed
and then another led_trigger_register() tries to access it:

BUG: unable to handle page fault for address: ffffffffc06d3bc0
RIP: 0010:strcmp+0xc/0x30
  Call Trace:
    <TASK>
    led_trigger_register+0x10d/0x4f0
    led_trigger_register_simple+0x7d/0x100
    bt_init+0x39/0xf7 [bluetooth]
    do_one_initcall+0xd0/0x4e0

Fixes: e64c97b53bc6 ("Bluetooth: Add combined LED trigger for controller power")
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 1661979..ce744b1 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -736,7 +736,7 @@ static int __init bt_init(void)
 
        err = bt_sysfs_init();
        if (err < 0)
 
        err = bt_sysfs_init();
        if (err < 0)

-               return err;
+               goto cleanup_led;

 
        err = sock_register(&bt_sock_family_ops);
        if (err)
 
        err = sock_register(&bt_sock_family_ops);
        if (err)


@@ -772,6 +772,8 @@ unregister_socket:
        sock_unregister(PF_BLUETOOTH);
 cleanup_sysfs:
        bt_sysfs_cleanup();
        sock_unregister(PF_BLUETOOTH);
 cleanup_sysfs:
        bt_sysfs_cleanup();

+cleanup_led:
+       bt_leds_cleanup();

        return err;
 }
 
        return err;
 }