From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9E70C4161D for ; Wed, 5 May 2021 17:15:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C5EB6117A for ; Wed, 5 May 2021 17:15:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239969AbhEERPz (ORCPT ); Wed, 5 May 2021 13:15:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:60288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236524AbhEERDE (ORCPT ); Wed, 5 May 2021 13:03:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A744161042; Wed, 5 May 2021 16:41:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232903; bh=vbZ7pUQk06s1GsGBwbOglzFvRDqryA7w0SmdVJDMFRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nknfSYcsCwRe9XZPXFb4dIAUHxNh5eEYJcnhLHM4HEIbFAmkYIZs4jIxtxlw9WG8y jkQ9ec2iJMs7gC6f5St/Tctx0aNIZFdni5bLjU66KSllAWKa59aqQbJxOhbxqHexRW POGmmyeg8E6kLQvf6v64ikPAyhAgwNGQwP1WPRgvE70qIpW2W/doO6kL18L+binlNw 8YzDPLbVD1/Aa0YbPh/4jGWqTi5lc1cimHIYAnhiqaMYAvFy3xEk4v6KNXmQ0CGmJy gqJxSUwxTL/fr+hUif1gx7J2XG2a9lKnGsrCgqMUJHLHeJ8o7YTl/1k5pgEJAUEfCU KpfNHofRkj2Kg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tetsuo Handa , syzbot , Marcel Holtmann , Sasha Levin , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 09/22] Bluetooth: initialize skb_queue_head at l2cap_chan_create() Date: Wed, 5 May 2021 12:41:16 -0400 Message-Id: <20210505164129.3464277-9-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505164129.3464277-1-sashal@kernel.org> References: <20210505164129.3464277-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tetsuo Handa [ 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 Signed-off-by: Tetsuo Handa Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- net/bluetooth/l2cap_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index d586caaa3af4..204b6ebd2a24 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -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 */ -- 2.30.2