aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Maris <amaris@redhat.com>2019-03-14 16:51:16 -0400
committerArjun Shankar <arjun@redhat.com>2019-05-02 14:29:11 +0200
commit4a5e58827f2b6efa94ea50a9db5f3c861173837f (patch)
tree0ff3a2c97aa52a280ca3df3a1e255ce80385d16a
parent38e89818335400b5593943f92a379b9c669b758c (diff)
downloadglibc-4a5e58827f2b6efa94ea50a9db5f3c861173837f.tar
glibc-4a5e58827f2b6efa94ea50a9db5f3c861173837f.tar.gz
glibc-4a5e58827f2b6efa94ea50a9db5f3c861173837f.tar.bz2
glibc-4a5e58827f2b6efa94ea50a9db5f3c861173837f.zip
malloc: Check for large bin list corruption when inserting unsorted chunk
Fixes bug 24216. This patch adds security checks for bk and bk_nextsize pointers of chunks in large bin when inserting chunk from unsorted bin. It was possible to write the pointer to victim (newly inserted chunk) to arbitrary memory locations if bk or bk_nextsize pointers of the next large bin chunk got corrupted. (cherry picked from commit 5b06f538c5aee0389ed034f60d90a8884d6d54de)
-rw-r--r--malloc/malloc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 6ae22e61dc..0e9a2e23ec 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -3869,10 +3869,14 @@ _int_malloc (mstate av, size_t bytes)
{
victim->fd_nextsize = fwd;
victim->bk_nextsize = fwd->bk_nextsize;
+ if (__glibc_unlikely (fwd->bk_nextsize->fd_nextsize != fwd))
+ malloc_printerr ("malloc(): largebin double linked list corrupted (nextsize)");
fwd->bk_nextsize = victim;
victim->bk_nextsize->fd_nextsize = victim;
}
bck = fwd->bk;
+ if (bck->fd != fwd)
+ malloc_printerr ("malloc(): largebin double linked list corrupted (bk)");
}
}
else