Commit 1d0dbc3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4515866d bca4104b

kernel/locking/lockdep.c

+2 −1
Original line number Diff line number Diff line
@@ -3497,6 +3497,7 @@ 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));

			if (size > req)

				add_chain_block(curr + req, size - req);

			return curr;

		}