UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2014-12-23 10:27:44 +01:00
parent 97bf6af1f9 95bfdf23e4
commit 84dccbee2f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/lib/lockdep/preload.c
View File

@ -317,7 +317,7 @@ int pthread_mutex_destroy(pthread_mutex_t *mutex)
* *
* TODO: Hook into free() and add that check there as well. * 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)); __del_lock(__get_lock(mutex));
return ll_pthread_mutex_destroy(mutex); return ll_pthread_mutex_destroy(mutex);
} }
@ -341,7 +341,7 @@ int pthread_rwlock_destroy(pthread_rwlock_t *rwlock)
{ {
try_init_preload(); 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)); __del_lock(__get_lock(rwlock));
return ll_pthread_rwlock_destroy(rwlock); return ll_pthread_rwlock_destroy(rwlock);
} }