diff options
| author | Moritz Eckert <m.eckert@cs.ucsb.edu> | 2018-08-16 21:08:36 -0400 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2018-11-09 10:16:43 -0500 |
| commit | 7e40c3f804b5d5dbbc0519565b16101ab22fb899 (patch) | |
| tree | 40bc8fee90bc27fe106d18386613fe74598529b5 | |
| parent | 510a25f2d208e3b0c86f54b053f61c5b647e4b9b (diff) | |
| download | glibc-7e40c3f804b5d5dbbc0519565b16101ab22fb899.tar.gz glibc-7e40c3f804b5d5dbbc0519565b16101ab22fb899.tar.xz glibc-7e40c3f804b5d5dbbc0519565b16101ab22fb899.zip | |
malloc: Mitigate null-byte overflow attacks
* malloc/malloc.c (_int_free): Check for corrupt prev_size vs size. (malloc_consolidate): Likewise. (cherry picked from commit d6db68e66dff25d12c3bc5641b60cbd7fb6ab44f)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | malloc/malloc.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 44795b2e61..e81991066e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-08-16 DJ Delorie <dj@delorie.com> + + * malloc/malloc.c (_int_free): Check for corrupt prev_size vs size. + (malloc_consolidate): Likewise. + 2018-08-16 Pochang Chen <johnchen902@gmail.com> * malloc/malloc.c (_int_malloc.c): Verify size of top chunk. diff --git a/malloc/malloc.c b/malloc/malloc.c index 9431108626..7c8bf8413c 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4281,6 +4281,8 @@ _int_free (mstate av, mchunkptr p, int have_lock) prevsize = prev_size (p); size += prevsize; p = chunk_at_offset(p, -((long) prevsize)); + if (__glibc_unlikely (chunksize(p) != prevsize)) + malloc_printerr ("corrupted size vs. prev_size while consolidating"); unlink(av, p, bck, fwd); } @@ -4442,6 +4444,8 @@ static void malloc_consolidate(mstate av) prevsize = prev_size (p); size += prevsize; p = chunk_at_offset(p, -((long) prevsize)); + if (__glibc_unlikely (chunksize(p) != prevsize)) + malloc_printerr ("corrupted size vs. prev_size in fastbins"); unlink(av, p, bck, fwd); } |