Bluetooth: initialize skb_queue_head at l2cap_chan_create()
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Sun, 21 Mar 2021 22:52:07 +0000 (07:52 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 May 2021 08:40:29 +0000 (10:40 +0200)
[ Upstream commit be8597239379f0f53c9710dd6ab551bbf535bec6 ]

syzbot is hitting "INFO: trying to register non-static key." message [1],
for "struct l2cap_chan"->tx_q.lock spinlock is not yet initialized when
l2cap_chan_del() is called due to e.g. timeout.

Since "struct l2cap_chan"->lock mutex is initialized at l2cap_chan_create()
immediately after "struct l2cap_chan" is allocated using kzalloc(), let's
as well initialize "struct l2cap_chan"->{tx_q,srej_q}.lock spinlocks there.

[1] https://syzkaller.appspot.com/bug?extid=fadfba6a911f6bf71842

Reported-and-tested-by: syzbot <syzbot+fadfba6a911f6bf71842@syzkaller.appspotmail.com>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/bluetooth/l2cap_core.c

index d586caaa3af44b3ab21c55929bca1c936ca30c6b..204b6ebd2a24e6c67fcc8bccf8d13662a4887c6b 100644 (file)
@@ -445,6 +445,8 @@ struct l2cap_chan *l2cap_chan_create(void)
        if (!chan)
                return NULL;
 
+       skb_queue_head_init(&chan->tx_q);
+       skb_queue_head_init(&chan->srej_q);
        mutex_init(&chan->lock);
 
        /* Set default lock nesting level */