Merge tag 'locking-urgent-2023-11-26' of git://git.kernel.org/pub/scm…

…/linux/kernel/git/tip/tip Pull locking fix from Ingo Molnar: "Fix lockdep block chain corruption resulting in KASAN warnings" * tag 'locking-urgent-2023-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: lockdep: Fix block chain corruption
mariux64 · Nov 26, 2023 · 1d0dbc3 · 1d0dbc3
2 parents 4515866 + bca4104
commit 1d0dbc3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
@@ -3497,7 +3497,8 @@ static int alloc_chain_hlocks(int req)
 		size = chain_block_size(curr);
 		if (likely(size >= req)) {
 			del_chain_block(0, size, chain_block_next(curr));
-			add_chain_block(curr + req, size - req);
+			if (size > req)
+				add_chain_block(curr + req, size - req);
 			return curr;
 		}
 	}