Skip to contentSkip to conversation

locking fix

GIT PULL Merged Ingo Molnar 2 participants 2 messages Nov 26, 2023 Locking primitives

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest locking/urgent git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-2023-11-26

# HEAD: bca4104b00fec60be330cd32818dd5c70db3d469 lockdep: Fix block chain corruption

Fix lockdep block chain corruption resulting in KASAN warnings.

Thanks,

Ingo

------------------>
Peter Zijlstra (1):
lockdep: Fix block chain corruption

 kernel/locking/lockdep.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/locking/lockdep.c +2 -1
index e85b5ad3e206..151bd3de5936 100644
@@ -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;
 		}
 	}
merge bot Merged
#1 lore raw
The pull request you sent on Sun, 26 Nov 2023 10:39:24 +0100:

The pull request you sent on Sun, 26 Nov 2023 10:39:24 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-2023-11-26

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1d0dbc3d16e8215838d9898d0191e8c0d2cc77af

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html