Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84dccbee authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'liblockdep-fixes-3.19' of... 

Merge branch 'liblockdep-fixes-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux

 into core/urgent

Pull a liblockdep fix from Sasha Levin:

 "A small (but important) fix to the way we detect freeing live locks. We would
  pass a wrong memory region when testing for locks inside freed memory spaces,
  which would trigger false positives."

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 97bf6af1 95bfdf23

tools/lib/lockdep/preload.c

+2 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ int pthread_mutex_destroy(pthread_mutex_t *mutex) 
	 *

	 * TODO: Hook into free() and add that check there as well.

	 */

	debug_check_no_locks_freed(mutex, mutex + sizeof(*mutex));

	debug_check_no_locks_freed(mutex, sizeof(*mutex));

	__del_lock(__get_lock(mutex));

	return ll_pthread_mutex_destroy(mutex);

}
@@ -341,7 +341,7 @@ int pthread_rwlock_destroy(pthread_rwlock_t *rwlock) 
{

	try_init_preload();



	debug_check_no_locks_freed(rwlock, rwlock + sizeof(*rwlock));

	debug_check_no_locks_freed(rwlock, sizeof(*rwlock));

	__del_lock(__get_lock(rwlock));

	return ll_pthread_rwlock_destroy(rwlock);

}