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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91ED2C433FE for ; Tue, 18 Oct 2022 00:51:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230368AbiJRAv2 (ORCPT ); Mon, 17 Oct 2022 20:51:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230086AbiJRAvK (ORCPT ); Mon, 17 Oct 2022 20:51:10 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC8E379A61; Mon, 17 Oct 2022 17:51:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 95532B81BFD; Tue, 18 Oct 2022 00:12:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3AA9C4347C; Tue, 18 Oct 2022 00:12:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666051933; bh=F6l8KGZgbu2ZLbKQjVZsD50NFW49wAHUKxelZAvZLsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kixHeggNvqnEO/uXzp5sM+rLf6EaA/qq8W6Z6RuuMZlviBzSdKCS228ZdWL8IauPC RIoTsts7eg+Ulj9GHFle2eZ0+MrlUXq+lcwXePtM+qQPkROX3RJGapvFWiIwR0DdKw jOBhAJrwT64h37iDoWagG2OqOEeVhs4h7fLzQfOKBgff5IK33PW8/clyBSGA1cucFh xszeHAVYPn3BCMv69adhPmzDA3IEqZKPCi0tiBvQcR4VwWyzzTOsulZu71A0hS8qxv WegD7bXMJJGqoPKiffhqgaIm20uzGQTG6w1hBRPTZ+N/Xd6mtc0frRuGdUCQSlQ2w5 n0JR/H2PpbvHA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dominique Martinet , syzbot+50f7e8d06c3768dd97f3@syzkaller.appspotmail.com, Schspa Shi , Sasha Levin , ericvh@gmail.com, lucho@ionkov.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, v9fs-developer@lists.sourceforge.net, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 6/8] 9p: trans_fd/p9_conn_cancel: drop client lock earlier Date: Mon, 17 Oct 2022 20:12:00 -0400 Message-Id: <20221018001202.2732458-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221018001202.2732458-1-sashal@kernel.org> References: <20221018001202.2732458-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: Dominique Martinet [ Upstream commit 52f1c45dde9136f964d63a77d19826c8a74e2c7f ] syzbot reported a double-lock here and we no longer need this lock after requests have been moved off to local list: just drop the lock earlier. Link: https://lkml.kernel.org/r/20220904064028.1305220-1-asmadeus@codewreck.org Reported-by: syzbot+50f7e8d06c3768dd97f3@syzkaller.appspotmail.com Signed-off-by: Dominique Martinet Tested-by: Schspa Shi Signed-off-by: Sasha Levin --- net/9p/trans_fd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 33b317a25a2d..83cdb13c6322 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -215,6 +215,8 @@ static void p9_conn_cancel(struct p9_conn *m, int err) list_move(&req->req_list, &cancel_list); } + spin_unlock(&m->client->lock); + list_for_each_entry_safe(req, rtmp, &cancel_list, req_list) { p9_debug(P9_DEBUG_ERROR, "call back req %p\n", req); list_del(&req->req_list); @@ -222,7 +224,6 @@ static void p9_conn_cancel(struct p9_conn *m, int err) req->t_err = err; p9_client_cb(m->client, req, REQ_STATUS_ERROR); } - spin_unlock(&m->client->lock); } static int -- 2.35.1