[PATCH 1/1] malloc: remove redundant check of unsorted bin corruption

[PATCH 1/1] malloc: remove redundant check of unsorted bin corruption

[Ayush Mittal]

* malloc/malloc.c (_int_malloc): remove redundant check of
  unsorted bin corruption

With commit "b90ddd08f6dd688e651df9ee89ca3a69ff88cd0c"
(malloc: Additional checks for unsorted bin integrity),
same check of (bck->fd != victim) is added before checking of unsorted
chunk corruption, which was added in "bdc3009b8ff0effdbbfb05eb6b10966753cbf9b8"
(Added check before removing from unsorted list).

..
3773           if (__glibc_unlikely (bck->fd != victim)
3774               || __glibc_unlikely (victim->fd != unsorted_chunks (av)))
3775             malloc_printerr ("malloc(): unsorted double linked list corrupted");
..
..
3815           /* remove from unsorted list */
3816          if (__glibc_unlikely (bck->fd != victim))
3817            malloc_printerr ("malloc(): corrupted unsorted chunks 3");
3818          unsorted_chunks (av)->bk = bck;
..

So this extra check can be removed.

Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
Signed-off-by: Ayush Mittal <ayush.m@samsung.com>
---
 malloc/malloc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 5b87bdb081..77bde442ab 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -3813,8 +3813,6 @@ _int_malloc (mstate av, size_t bytes)
             }
 
           /* remove from unsorted list */
-          if (__glibc_unlikely (bck->fd != victim))
-            malloc_printerr ("malloc(): corrupted unsorted chunks 3");
           unsorted_chunks (av)->bk = bck;
           bck->fd = unsorted_chunks (av);
 
-- 
2.17.1

Re: [PATCH 1/1] malloc: remove redundant check of unsorted bin corruption

[DJ Delorie]

Ayush Mittal via Libc-alpha <libc-alpha@sourceware.org> writes:
> * malloc/malloc.c (_int_malloc): remove redundant check of
>   unsorted bin corruption
>
> With commit "b90ddd08f6dd688e651df9ee89ca3a69ff88cd0c"
> (malloc: Additional checks for unsorted bin integrity),
> same check of (bck->fd != victim) is added before checking of unsorted
> chunk corruption, which was added in "bdc3009b8ff0effdbbfb05eb6b10966753cbf9b8"
> (Added check before removing from unsorted list).

Sorry this one fell through the cracks.  LGTM.  Pushed.

Reviewed-by: DJ Delorie <dj@redhat.com>