From: Marcel Holtmann <marcel@holtmann.org>
To: Wang Hai <wanghai38@huawei.com>
Cc: Karsten Keil <isdn@linux-pingi.de>,
Johan Hedberg <johan.hedberg@gmail.com>,
Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Thadeu Lima de Souza Cascardo <cascardo@canonical.com>,
"open list:NETWORKING [GENERAL]" <netdev@vger.kernel.org>,
linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails
Date: Fri, 22 Oct 2021 06:48:47 +0200 [thread overview]
Message-ID: <9D8B1F5B-8EFE-40CB-BC85-F6EC3483CC61@holtmann.org> (raw)
In-Reply-To: <20211022034417.766659-1-wanghai38@huawei.com>
Hi Wang,
> 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>
> ---
> net/bluetooth/cmtp/core.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
> index 0a2d78e811cf..ccf48f50afdf 100644
> --- a/net/bluetooth/cmtp/core.c
> +++ b/net/bluetooth/cmtp/core.c
> @@ -499,11 +499,13 @@ int cmtp_get_conninfo(struct cmtp_conninfo *ci)
>
> static int __init cmtp_init(void)
> {
> + int err;
> +
> BT_INFO("CMTP (CAPI Emulation) ver %s", VERSION);
>
> - cmtp_init_sockets();
> + err = cmtp_init_sockets();
>
> - return 0;
> + return err;
> }
just do return cmtp_init_sockets();
Regards
Marcel
next prev parent reply other threads:[~2021-10-22 4:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-22 3:44 [PATCH] Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails Wang Hai
2021-10-22 4:08 ` bluez.test.bot
2021-10-22 4:48 ` Marcel Holtmann [this message]
2021-10-22 8:43 ` [PATCH] " wanghai (M)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9D8B1F5B-8EFE-40CB-BC85-F6EC3483CC61@holtmann.org \
--to=marcel@holtmann.org \
--cc=cascardo@canonical.com \
--cc=davem@davemloft.net \
--cc=isdn@linux-pingi.de \
--cc=johan.hedberg@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=wanghai38@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).