diff options
| author | Zhiqiang Zhang <zhangzhiqiang.zhang@huawei.com> | 2015-03-18 18:44:50 +0800 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2015-03-18 22:33:43 +0100 |
| commit | 85cfbc035370d2a3715ea9de3e590ba83fae52d1 (patch) | |
| tree | 068f977c2a1ec798f062d3b6f2a9d023572350bc /libc/stdlib/malloc-standard/memalign.c | |
| parent | 6c4538905e65ceb203f59aaa9a61728e81c6bc0a (diff) | |
malloc: checked_request2size failure deadlocks
For some rarely cases(almost App bugs), calling malloc with
a very largre size, checked_request2size check will fail,set
ENOMEM, and return 0 to caller.
But this will let __malloc_lock futex locked and owned by the
caller. In multithread circumstance, other thread calling
malloc/calloc will NOT succeed and get locked.
Signed-off-by: Zhiqiang Zhang <zhangzhiqiang.zhang@huawei.com>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc/stdlib/malloc-standard/memalign.c')
| -rw-r--r-- | libc/stdlib/malloc-standard/memalign.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/stdlib/malloc-standard/memalign.c b/libc/stdlib/malloc-standard/memalign.c index 6303c1dd9..e9ae5a7b9 100644 --- a/libc/stdlib/malloc-standard/memalign.c +++ b/libc/stdlib/malloc-standard/memalign.c @@ -52,8 +52,8 @@ void* memalign(size_t alignment, size_t bytes) alignment = a; } - __MALLOC_LOCK; checked_request2size(bytes, nb); + __MALLOC_LOCK; /* Strategy: find a spot within that chunk that meets the alignment * request, and then possibly free the leading and trailing space. */ |