Commit 189dbab0 authored Dec 06, 2017 by Linus Torvalds

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull lockdep fix from Ingo Molnar:
 "Fix a possible NULL dereference for the (rare) case when a task
  doesn't have ->xhlocks space allocated due to kmalloc() OOM-ing"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/lockdep: Fix possible NULL deref

parents 61d6be3a 5e351ad1

kernel/locking/lockdep.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -4790,6 +4790,7 @@ void lockdep_invariant_state(bool force)
		* Verify the former, enforce the latter.
		*/
		WARN_ON_ONCE(!force && current->lockdep_depth);
		if (current->xhlocks)
		invalidate_xhlock(&xhlock(current->xhlock_idx));
		}