diff options
| author |   Wang Hai <wanghai38@huawei.com> | 2021-10-25 21:10:12 +0800 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2021-10-25 15:02:04 +0200 |
| commit | 2a7ca7459d905febf519163bd9e3eed894de6bb7 (patch) | |
| tree | 026c4121e9bde2f3419d41134e8a78622503767c /net/bluetooth | |
| parent | Bluetooth: vhci: Fix checking of msft_opcode (diff) | |
| download | linux-dev-2a7ca7459d905febf519163bd9e3eed894de6bb7.tar.xz linux-dev-2a7ca7459d905febf519163bd9e3eed894de6bb7.zip | |
Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails
I got a kernel BUG report when doing fault injection test:
------------[ cut here ]------------
kernel BUG at lib/list_debug.c:45!
...
RIP: 0010:__list_del_entry_valid.cold+0x12/0x4d
...
Call Trace:
proto_unregister+0x83/0x220
cmtp_cleanup_sockets+0x37/0x40 [cmtp]
cmtp_exit+0xe/0x1f [cmtp]
do_syscall_64+0x35/0xb0
entry_SYSCALL_64_after_hwframe+0x44/0xae
If cmtp_init_sockets() in cmtp_init() fails, cmtp_init() still returns
success. This will cause a kernel bug when accessing uncreated ctmp
related data when the module exits.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/cmtp/core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c index 0a2d78e811cf..83eb84e8e688 100644 --- a/net/bluetooth/cmtp/core.c +++ b/net/bluetooth/cmtp/core.c @@ -501,9 +501,7 @@ static int __init cmtp_init(void) { BT_INFO("CMTP (CAPI Emulation) ver %s", VERSION); - cmtp_init_sockets(); - - return 0; + return cmtp_init_sockets(); } static void __exit cmtp_exit(void) |