Received-SPF: pass (google.com: domain of linux-kernel+bounces-16263-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Xuewen Yan <xuewen.yan@unisoc.com>
To: <peterz@infradead.org>, <mingo@redhat.com>, <will@kernel.org>
CC: <longman@redhat.com>, <boqun.feng@gmail.com>, <ke.wang@unisoc.com>,
        <zhiguo.niu@unisoc.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] lock/lockdep: Add missing graph_unlock in validate_chain
Date: Thu, 4 Jan 2024 13:40:30 +0800
Message-ID: <20240104054030.14733-1-xuewen.yan@unisoc.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain

The lookup_chain_cache_add will get graph_lock, but the
validate_chain do not unlock before return 0.

So add graph_unlock before return 0.

Signed-off-by: Xuewen Yan <xuewen.yan@unisoc.com>
Signed-off-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
---
 kernel/locking/lockdep.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 151bd3de5936..24995e1ebc62 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -3855,8 +3855,11 @@ static int validate_chain(struct task_struct *curr,
 		 */
 		int ret = check_deadlock(curr, hlock);
 
-		if (!ret)
+		if (!ret) {
+			graph_unlock();
 			return 0;
+		}
+
 		/*
 		 * Add dependency only if this lock is not the head
 		 * of the chain, and if the new lock introduces no more
@@ -3865,9 +3868,9 @@ static int validate_chain(struct task_struct *curr,
 		 * serializes nesting locks), see the comments for
 		 * check_deadlock().
 		 */
-		if (!chain_head && ret != 2) {
-			if (!check_prevs_add(curr, hlock))
-				return 0;
+		if (!chain_head && ret != 2 && !check_prevs_add(curr, hlock)) {
+			graph_unlock();
+			return 0;
 		}
 
 		graph_unlock();
-- 
2.25.1