From patchwork Fri Jul 1 07:42:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MAYANK HAARIT X-Patchwork-Id: 642867 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rgpLj1V1xz9sdQ for ; Fri, 1 Jul 2016 17:43:40 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIt6c-0000Dd-Ls; Fri, 01 Jul 2016 07:43:18 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bIt6a-0000Aj-NI for hostap@lists.infradead.org; Fri, 01 Jul 2016 07:43:17 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O9M032LFLFEJ890@mailout2.samsung.com> for hostap@lists.infradead.org; Fri, 01 Jul 2016 16:42:50 +0900 (KST) Received: from epcpsbgx2.samsung.com ( [172.20.52.125]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 5B.81.05160.AFE16775; Fri, 1 Jul 2016 16:42:50 +0900 (KST) X-AuditID: cbfee68e-f79266d000001428-6e-57761efa5870 Received: from epmailer02 ( [203.254.219.142]) by epcpsbgx2.samsung.com (EPCPMTA) with SMTP id 7D.3D.04972.BEE16775; Fri, 1 Jul 2016 16:42:35 +0900 (KST) Date: Fri, 01 Jul 2016 07:42:35 +0000 (GMT) From: MAYANK HAARIT Subject: [PATCH] Avoid double free(p2p->after_scan_tx) in p2p_deinit() To: "hostap@lists.infradead.org" MIME-version: 1.0 X-MTR: 20160701073436439@mayank.h Msgkey: 20160701073436439@mayank.h X-EPLocale: en_US.utf-8 X-Priority: 3 X-EPWebmail-Msg-Type: personal X-EPWebmail-Reply-Demand: 0 X-EPApproval-Locale: X-EPHeader: ML X-MLAttribute: X-RootMTR: 20160701073436439@mayank.h X-ParentMTR: X-ArchiveUser: X-CPGSPASS: N X-ConfirmMail: N,general MIME-version: 1.0 Message-id: <1396284100.1214631467358955163.JavaMail.weblogic@epmlwas01b> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEKsWRmVeSWpSXmKPExsWyRsSkVveXXFm4wZvZmhZrH6U5MHpsXlIf wBglYpOSmpNZllqkb4dgJYhkHP5aXPCJveL0iWtsDYxX2LsYOTmEBJQllh35yQRiSwiYSKz+ t4wdwhaTuHBvPVsXIxdQzVJGiT0f97B2MXKAFbW/N4aIz2GUeLV8NytIA4uAisS+a1PAbDYB bYlPM9aCDRIWcJO49PUjC4gtImArsXrLF7A4s4CBxO72U8wQR8hJzO9/wgZi8woISpyc+YQF 4ghFicuv9jFCxJUkupcsgjpOXOJvwyMom1diRvtTqHo5iWlf1zBD2NIS52dtYIR5ZvH3x1Bx foljt3dAPSwgMfXMQagaNYmj3X9ZIWw+iTUL37LA1O86tZwZZtf9LXOheiUktrY8YYX4RVFi SvdDdlD4MAtoSqzfpY/uFV4BT4mZ+0BhywXUeoFD4u33XrYJjEqzkNTNQjJqFsIoZCULGFlW MYqmFiQXFCelFxnpFSfmFpfmpesl5+duYgSmidP/nvXtYLx5wPoQozoHo5RoaV5xcmJeXmJS Tmp8bmJOWn5RbmqKEg+vwOzScCHWxLLiytxDjKbAyJvILCWanA9MXXkl8YbGZkYWpiamxkbm lmZK4rwJUj+DhQTSE0tSs1NTC1KL4otKc1KLDzEycXBKNTAmy2/OsyzyTpHQ3Cj8ytyt6qEc r2vyLGvD+8+f2p9KyPXb0yZ6iPP9k69ff8ZzaP09qar8pcZZee2b82VST6zmfjRPuivsHX+h +Oc2u/Ppiow32yJrggy0/0dscpz49Xa75yyHycc7pXni7HJUl/WEhLz4483bs2x9m9X0oA/B PtVZX9+ptCixFGckGmoxFxUnAgDnTe8KJQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPKsWRmVeSWpSXmKPExsVy+t/tPt3XcmXhBi3H+SzWPkpzYPTYvKQ+ gDGqwCYlNSezLLVI384mIzUxJbVIITUvOT8lMy/dVsk7ON453tTMwFDX0NLCXEkhLzE31VbJ xSdA1y0zB2i6kkJZYk4pUCggsbhYCWhCUX5pSapCRn5xia1StKG5kZ6RgZ6pkZ6haayVoYGB kSlQTUJBxuGvxQWf2CtOn7jG1sB4hb2LkZNDSEBZYtmRn0xdjBwcEgImEu3vjUHCEgJiEhfu rWfrYuQCKpnDKPFq+W5WkASLgIrEvmtTwGw2AW2JTzPWgs0RFnCTuPT1IwuILSJgK7F6yxew OLOAgcTu9lPMELvkJOb3P2EDsXkFBCVOznzCArFMUeLyq32MEHElie4li9gh4uISfxseQdm8 EjPan0LVy0lM+7qGGcKWljg/awMjzNGLvz+GivNLHLu9gwnCFpCYeuYgVI2axNHuv6wQNp/E moVvWWDqd51azgyz6/6WuVC9EhJbW56wQvyiKDGl+yE7KKyYBTQl1u/SR/cKr4CnxMx9y9gn MMrOQpKahaR7FkI3spIFjCyrGEVTC5ILipPSK4z0ihNzi0vz0vWS83M3MYJT0rNFOxj/nbc+ xKjOwSglWppXnJyYl5eYlJMan5uYk5ZflJuaosTDKzC7NFyINbGsuDL3EKMK0KZHG1ZfYJRi ycvPS1US4bUCpkUh3pTEyqrUovz4otKc1OJDjKbAaJ3ILCWanA9Munkl8YbGJuamxqYWBobm 5mZK4rwBf9eFCQmkJ5akZqemFqQWwfQxcXBKNTCmdspc2Gp2suD4z+jg6yu//uIK8tna03rX bXPlfzWVhLsf8/cXeVWEdYebzPW/cCf2u3RQuuKEg4vOl62NcPcKWfA3uK2pg10sjEd34st1 0muN5jnvn8p5O4pjsmHe/Q5d28v6KT9CFn6rzf6Qclf/9q7V4ZM3SXwL+v5uGq/JebFslkPP vtkqsRRnJBpqMRcVJwIAmYuN8YIDAAA= DLP-Filter: Pass X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160701_004316_901158_872592DE X-CRM114-Status: UNSURE ( 8.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -8.3 (--------) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-8.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [203.254.224.25 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: mayank.h@samsung.com Cc: SACHIN DEV SHARMA Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org As p2p->after_scan_tx is already freeing in p2p_flush() , Although p2p->after_scan_tx is assigning to NULL in p2p_flush() . So double free in p2p_deinit() is dead code. Signed-off-by: Mayank Haarit --- src/p2p/p2p.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- 1.7.0.4 diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index a209a56..f2b891b 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2980,7 +2980,6 @@ void p2p_deinit(struct p2p_data *p2p) os_free(p2p->groups); p2ps_prov_free(p2p); wpabuf_free(p2p->sd_resp); - os_free(p2p->after_scan_tx); p2p_remove_wps_vendor_extensions(p2p); os_free(p2p->no_go_freq.range); p2p_service_flush_asp(p2p);