Commit 3324e6e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locking_urgent_for_v5.17_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fix from Borislav Petkov:
 "Fix a NULL ptr dereference when dumping lockdep chains through
  /proc/lockdep_chains"

* tag 'locking_urgent_for_v5.17_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lockdep: Correct lock_classes index mapping
parents 22217739 28df029d

kernel/locking/lockdep.c

+2 −2
Original line number Diff line number Diff line
@@ -3462,7 +3462,7 @@ struct lock_class *lock_chain_get_class(struct lock_chain *chain, int i) 
	u16 chain_hlock = chain_hlocks[chain->base + i];

	unsigned int class_idx = chain_hlock_class_idx(chain_hlock);



	return lock_classes + class_idx - 1;

	return lock_classes + class_idx;

}



/*
@@ -3530,7 +3530,7 @@ static void print_chain_keys_chain(struct lock_chain *chain) 
		hlock_id = chain_hlocks[chain->base + i];

		chain_key = print_chain_key_iteration(hlock_id, chain_key);



		print_lock_name(lock_classes + chain_hlock_class_idx(hlock_id) - 1);

		print_lock_name(lock_classes + chain_hlock_class_idx(hlock_id));

		printk("\n");

	}

}