From patchwork Thu Apr 8 09:29:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayush Mittal X-Patchwork-Id: 42931 X-Patchwork-Delegate: dj@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D81243854833; Thu, 8 Apr 2021 09:31:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D81243854833 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1617874277; bh=X4Z4nf1vhkvJy5oEVQedaSScO5Q0Wf5U8WVlGEboFuA=; h=To:Subject:Date:References:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=phZHKdVthtt9eY6LI4hwk7kgwSmlpZVRl81kRLOOv33RhUm5TuLpY+GZlD6qbSxcD J2a1N4AFOVofvwst/p8yr/urzYbpRQLncJ6KkxL88DzDihRGlwuGSvC2blONKrPn07 dKMlQs/0auKbfu5WrlBdFLpaS478VOjvr/LoKTyU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by sourceware.org (Postfix) with ESMTPS id 228BF3854804 for ; Thu, 8 Apr 2021 09:31:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 228BF3854804 Received: from epcas5p1.samsung.com (unknown [182.195.41.39]) by mailout2.samsung.com (KnoxPortal) with ESMTP id 20210408093110epoutp02dfa9c8dbf32cbbacf8784ba019dcf3fb~z2BO053uB0598105981epoutp02q for ; Thu, 8 Apr 2021 09:31:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20210408093110epoutp02dfa9c8dbf32cbbacf8784ba019dcf3fb~z2BO053uB0598105981epoutp02q Received: from epsmges5p3new.samsung.com (unknown [182.195.42.75]) by epcas5p3.samsung.com (KnoxPortal) with ESMTP id 20210408093109epcas5p360ea69a78e687b93bb47cb86d54899c4~z2BOEFHOX1375313753epcas5p3w; Thu, 8 Apr 2021 09:31:09 +0000 (GMT) Received: from epcas5p2.samsung.com ( [182.195.41.40]) by epsmges5p3new.samsung.com (Symantec Messaging Gateway) with SMTP id CB.29.41008.D5DCE606; Thu, 8 Apr 2021 18:31:09 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas5p4.samsung.com (KnoxPortal) with ESMTPA id 20210408092938epcas5p4c8c403c2aa26d19185e1be641ce293aa~z1-445D-Y1911019110epcas5p4P; Thu, 8 Apr 2021 09:29:38 +0000 (GMT) Received: from epsmgms1p2.samsung.com (unknown [182.195.42.42]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20210408092938epsmtrp29220c11e288e7a081c5e8ef538b402a5~z1-44C0FY2753927539epsmtrp2P; Thu, 8 Apr 2021 09:29:38 +0000 (GMT) X-AuditID: b6c32a4b-661ff7000001a030-d1-606ecd5d44c0 Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p2.samsung.com (Symantec Messaging Gateway) with SMTP id 9A.3D.08745.10DCE606; Thu, 8 Apr 2021 18:29:37 +0900 (KST) Received: from localhost.localdomain (unknown [107.109.224.44]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20210408092931epsmtip23f376b552558df92023efa93f8992e88~z1-ynOuOG1183511835epsmtip2N; Thu, 8 Apr 2021 09:29:27 +0000 (GMT) To: libc-alpha@sourceware.org Subject: [PATCH 1/1] malloc: remove redundant check of unsorted bin corruption Date: Thu, 8 Apr 2021 14:59:09 +0530 Message-Id: <1617874149-11830-1-git-send-email-ayush.m@samsung.com> X-Mailer: git-send-email 2.7.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsWy7bCmhm7s2bwEgwtfJCwu7k612LzuJLPF ld/72S1+39vJZnF4fhuLA6tH35ZVjB7bf7sFMEVx2aSk5mSWpRbp2yVwZZx6tJWxYAVPxaPH R1gbGLdwdjFyckgImEg8/LaQqYuRi0NIYDejxK+231DOJ0aJl63tUM5nRonp748xwrSs/N7M CpHYxSixfeUsdgjnC6PEzk3XwKrYBDQkDqyaygJiiwjISix6eIkZxGYWKJS4PGElUDcHh7BA gMTGp2kgYRYBVYk/E06BtfIKOEt8XdPCCrFMTuLmuU5mCLuZXeLVyWgI20Xi5exNUAcJS7w6 voUdwpaS+PxuLxtUPaNE238TkNskBHoYJS6s+MUCkbCXeN3cwARyA7OApsT6XfoQYVmJqafW MUGcySfR+/sJE0ScV2LHPBhbUWLVinNQe8Ulur90Qe31kHjzsxssLiQQK/Fm9xGmCYyysxA2 LGBkXMUomVpQnJueWmxaYJyXWq5XnJhbXJqXrpecn7uJERzFWt47GB89+KB3iJGJg/EQowQH s5II747e7AQh3pTEyqrUovz4otKc1OJDjNIcLErivDsMHsQLCaQnlqRmp6YWpBbBZJk4OKUa mBzM8hLrcu/s5RW5xypxb8fvBvdyU9E5O7yTClRn7fD5aLGAwSsuZGpbgdOyGgb2u99vZaqr lpqmSR+aF+cyt/hI0nubOS27pXorw8yCnh5c5JJ40Tj7haRkKsPkc0cXvlKzlrVKrA3+e/tD Vqfqyy41F0lfu7k/PwXcPPbMfmKw0Oq842FPdp552bXii1m4fdu8ylDvH+Ibks9/F3n04quu 85R2wVgT0SViXzSZ/gbzvRDTyfZmva4buj1jmcTe8I9LXfIkLdqiY5NzVRmmFrqy8QpdbeMQ nR6zVFlo6lXh+bc1Nt5m/r5edtoHhySJ8JVv9qcF/ipgfxty7Lryl5mBF69nu5aEJrCE3XZU YinOSDTUYi4qTgQAE3YVHlEDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKJMWRmVeSWpSXmKPExsWy7bCSvC7j2bwEg88HLCwu7k612LzuJLPF ld/72S1+39vJZnF4fhuLA6tH35ZVjB7bf7sFMEVx2aSk5mSWpRbp2yVwZZx6tJWxYAVPxaPH R1gbGLdwdjFyckgImEis/N7M2sXIxSEksINRouPVHnaIhLhE8/GrzBC2sMTKf8/ZIYo+MUrM OLEZrIhNQEPiwKqpLCC2iICsxKKHl8AamAVKJT6uuMMKYgsL+Els6D8FVsMioCrxZ8IpRhCb V8BZ4uuaFlaIBXISN891Mk9g5FnAyLCKUTK1oDg3PbfYsMAoL7Vcrzgxt7g0L10vOT93EyM4 JLS0djDuWfVB7xAjEwfjIUYJDmYlEd4dvdkJQrwpiZVVqUX58UWlOanFhxilOViUxHkvdJ2M FxJITyxJzU5NLUgtgskycXBKNTAlnvXJcb+RWXDyT8gXI7bpPCfVExzuJpd4y/laJ5nbJB5L +bhcu0jz0d5PUzSOcdWsyXv1/n9bSfdDNbcHjbZFi0UM3QqjLAVOa0RHcm2ZIP5nb3NDYjBH 9Nujzc6PezisHV87bzn85sNEztmnt04+65/wzWWN25Z7p/NcbWd4HawUOZHZt0i30yLmWfD6 kF1WOxYl2eaY7Gr7+IvNq9lhg26twJk/l//Xspp3bFkYWvaaT+JJvhbDITGv4tu34ty3zNjX v2GXdsJXtjaBZ7/qHpl7sQs+XMBV9IVN79W6qfUuIudvLE44zVdoxPL6xAX5DU/vNZyrKN/T rKvPHf9Q2bGdSWnzFO9bVdoWbkosxRmJhlrMRcWJAFAgoQp4AgAA X-CMS-MailID: 20210408092938epcas5p4c8c403c2aa26d19185e1be641ce293aa X-Msg-Generator: CA X-Sendblock-Type: REQ_APPROVE CMS-TYPE: 105P X-CMS-RootMailID: 20210408092938epcas5p4c8c403c2aa26d19185e1be641ce293aa References: X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ayush Mittal via Libc-alpha From: Ayush Mittal Reply-To: Ayush Mittal Cc: maninder1.s@samsung.com, a.sahrawat@samsung.com, akhilesh.k@samsung.com, Ayush Mittal Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" * 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 Signed-off-by: Ayush Mittal Reviewed-by: DJ Delorie --- 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);