]> git.hungrycats.org Git - linux/commitdiff
Bluetooth: bnep: fix wild-memory-access in proto_unregister
authorYe Bin <yebin10@huawei.com>
Mon, 14 Oct 2024 09:07:08 +0000 (17:07 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Nov 2024 15:21:58 +0000 (16:21 +0100)
[ Upstream commit 64a90991ba8d4e32e3173ddd83d0b24167a5668c ]

There's issue as follows:
  KASAN: maybe wild-memory-access in range [0xdead...108-0xdead...10f]
  CPU: 3 UID: 0 PID: 2805 Comm: rmmod Tainted: G        W
  RIP: 0010:proto_unregister+0xee/0x400
  Call Trace:
   <TASK>
   __do_sys_delete_module+0x318/0x580
   do_syscall_64+0xc1/0x1d0
   entry_SYSCALL_64_after_hwframe+0x77/0x7f

As bnep_init() ignore bnep_sock_init()'s return value, and bnep_sock_init()
will cleanup all resource. Then when remove bnep module will call
bnep_sock_cleanup() to cleanup sock's resource.
To solve above issue just return bnep_sock_init()'s return value in
bnep_exit().

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Ye Bin <yebin10@huawei.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/bluetooth/bnep/core.c

index f749904272961fac915ac7cd447719b076f743b2..0eaa47ae6e993df966747ee7f03f60f294aec65a 100644 (file)
@@ -745,8 +745,7 @@ static int __init bnep_init(void)
        if (flt[0])
                BT_INFO("BNEP filters: %s", flt);
 
-       bnep_sock_init();
-       return 0;
+       return bnep_sock_init();
 }
 
 static void __exit bnep_exit(void)