Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c6cf0af authored by Chen Zhongjin's avatar Chen Zhongjin Committed by Greg Kroah-Hartman
Browse files

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: e64c97b5 ("Bluetooth: Add combined LED trigger for controller power")
Signed-off-by: default avatarChen Zhongjin <chenzhongjin@huawei.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 07ea5d74

net/bluetooth/af_bluetooth.c

+3 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ static int __init bt_init(void) 


	err = bt_sysfs_init();

	if (err < 0)

		return err;

		goto cleanup_led;



	err = sock_register(&bt_sock_family_ops);

	if (err)
@@ -771,6 +771,8 @@ static int __init bt_init(void) 
	sock_unregister(PF_BLUETOOTH);

cleanup_sysfs:

	bt_sysfs_cleanup();

cleanup_led:

	bt_leds_cleanup();

	return err;

}