diff options
| author | Kirill Smelkov <kirr@nexedi.com> | 2014-12-08 06:07:59 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2014-12-19 15:50:55 -0500 |
| commit | 95bfdf23e4d59099340c01064f39e7f6875c02bc (patch) | |
| tree | 14ab0f66f2786da3b4c7e342cd25a843f4dca5b4 | |
| parent | b2776bf7149bddd1f4161f14f79520f17fc1d71d (diff) | |
tools/liblockdep: Fix debug_check thinko in mutex destroy
In mutex destroy code currently we pass to debug_check_no_locks_freed()
[mem_from, mem_end)
address region. But debug_check_no_locks_freed() accepts
mem_from, mem_*len*
i.e. second parameter is region length, not end address. And it was
always so, starting from 2006 (fbb9ce95 "lockdep: core").
Fix it, or else on a mutex destroy we wrongly check
much-wider-than-mutex region and can find not-yet-released other locks
there and wrongly report BUGs on them.
Signed-off-by: Kirill Smelkov <kirr@nexedi.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | tools/lib/lockdep/preload.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c index 6f803609e498..0b0112c80f22 100644 --- a/tools/lib/lockdep/preload.c +++ b/tools/lib/lockdep/preload.c | |||
| @@ -317,7 +317,7 @@ int pthread_mutex_destroy(pthread_mutex_t *mutex) | |||
| 317 | * | 317 | * |
| 318 | * TODO: Hook into free() and add that check there as well. | 318 | * TODO: Hook into free() and add that check there as well. |
| 319 | */ | 319 | */ |
| 320 | debug_check_no_locks_freed(mutex, mutex + sizeof(*mutex)); | 320 | debug_check_no_locks_freed(mutex, sizeof(*mutex)); |
| 321 | __del_lock(__get_lock(mutex)); | 321 | __del_lock(__get_lock(mutex)); |
| 322 | return ll_pthread_mutex_destroy(mutex); | 322 | return ll_pthread_mutex_destroy(mutex); |
| 323 | } | 323 | } |
| @@ -341,7 +341,7 @@ int pthread_rwlock_destroy(pthread_rwlock_t *rwlock) | |||
| 341 | { | 341 | { |
| 342 | try_init_preload(); | 342 | try_init_preload(); |
| 343 | 343 | ||
| 344 | debug_check_no_locks_freed(rwlock, rwlock + sizeof(*rwlock)); | 344 | debug_check_no_locks_freed(rwlock, sizeof(*rwlock)); |
| 345 | __del_lock(__get_lock(rwlock)); | 345 | __del_lock(__get_lock(rwlock)); |
| 346 | return ll_pthread_rwlock_destroy(rwlock); | 346 | return ll_pthread_rwlock_destroy(rwlock); |
| 347 | } | 347 | } |
