From patchwork Tue Aug 21 11:37:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishant Chaprana X-Patchwork-Id: 960769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mVPcy1OV"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="Velguwcb"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41wCLV4Fcvz9s78 for ; Wed, 22 Aug 2018 13:13:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:List-Owner; bh=UGLv0+IW0IoJKXURH7SPGQMC/AIJZhZ3a0L3DPuccE8=; b=mV Pcy1OVFXJkc1Ftq6HL4fAqAfCt3+IVA3JKXtSjEyUMhsHFQ0epd2JLQrBhqlw8t8bw5qj5JpIZc2E 27iUjVX0gsmbwbkeATFyjHXKeTIaOQOClkd4kGiroq+fLs/Rs3p80/fzM3YuEWSIebhmXwrCtavPR Uy3RzQOpoo+SGU4dqWn4Ejb+bEsilbEkDQ04Gw4ZGFV+lkdxugJqDsDfMovw4YlkUiiuVbMnDH8RW Ps+ZR5m6UBAowmZI6dZvka8CL2YaamPy7x4jCA+5u/qh0/3ie+FJv9EXi9tqaEP0dXvlwnjGb0uN3 Vv7sLCqlXLTwct1ik5mleiuNzjF2xGbQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fsJaS-00078q-3r; Wed, 22 Aug 2018 03:13:36 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fsJaO-00077l-Sy for hostap@lists.infradead.org; Wed, 22 Aug 2018 03:13:35 +0000 Received: from epcas5p2.samsung.com (unknown [182.195.41.40]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20180822031315epoutp03000f81d02bbe7323836e1ba6be2de1dd~NFlOAQiJm3068830688epoutp03C for ; Wed, 22 Aug 2018 03:13:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20180822031315epoutp03000f81d02bbe7323836e1ba6be2de1dd~NFlOAQiJm3068830688epoutp03C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1534907595; bh=pFEfUgDm6UhzPjuNXvDfSAgoLjEg9GW/56bS71mZS8Y=; h=From:To:Cc:Subject:Date:References:From; b=Velguwcbf/PGzzWtqkblVhi2iWgOLnaT/OI/9MwJJ/hMwctkgz7e7pvoXS+HVkYne MKgm9o2gJ0WI2p+yNTqtGUtjpgK9abFi4n8ztaPcUVHU2yPHlJM9xgF3NehWUO9p1f rknPjaq2JY39jNC14dc3NMVgRsfleBE3dfCh/2EQ= Received: from epsmges5p3new.samsung.com (unknown [182.195.40.196]) by epcas5p1.samsung.com (KnoxPortal) with ESMTP id 20180822031315epcas5p1e41b8385e2884a3884fd1f54e0ccc2d6~NFlNXxVBV2412724127epcas5p1h; Wed, 22 Aug 2018 03:13:15 +0000 (GMT) Received: from epcas5p4.samsung.com ( [182.195.41.42]) by epsmges5p3new.samsung.com (Symantec Messaging Gateway) with SMTP id 63.96.04491.BC4DC7B5; Wed, 22 Aug 2018 12:13:15 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas5p3.samsung.com (KnoxPortal) with ESMTPA id 20180821113757epcas5p31daaead102d4d9cf9b0423e39272c087~M40lRJ4rA3204732047epcas5p39; Tue, 21 Aug 2018 11:37:57 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20180821113757epsmtrp2d185ec145d39fdf7b91300321226851d~M40lQYN3b2456124561epsmtrp24; Tue, 21 Aug 2018 11:37:57 +0000 (GMT) X-AuditID: b6c32a4b-a63ff7000000118b-55-5b7cd4cbdc0d Received: from epsmtip1.samsung.com ( [182.195.34.30]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id FA.C5.03631.499FB7B5; Tue, 21 Aug 2018 20:37:56 +0900 (KST) Received: from nishant-ubuntu.sa.corp.samsungelectronics.net (unknown [107.109.228.78]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20180821113756epsmtip168a23883709308b2d6984eb5a07a62c0~M40kjOAsj1721517215epsmtip1T; Tue, 21 Aug 2018 11:37:56 +0000 (GMT) From: Nishant Chaprana To: hostap@lists.infradead.org Subject: [PATCH] EAP-pwd peer: Fix memory leak in eap_pwd_perform_confirm_exchange() Date: Tue, 21 Aug 2018 17:07:51 +0530 X-Mailer: git-send-email 2.7.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOKsWRmVeSWpSXmKPExsWy7bCmlu7pKzXRBps+cVusfZRmsXXJfiaL Wzf6WRyYPTYvqffo27KKMYApKtUmIzUxJbVIITUvOT8lMy/dVsk7ON453tTMwFDX0NLCXEkh LzE31VbJxSdA1y0zB2iFkkJZYk4pUCggsbhYSd/Opii/tCRVISO/uMRWKdrQ0EjP0MBcz8gI SJvGWhmZApUkpGY0vFrIWDCHp2LLm3lMDYyfObsYOTkkBEwkug59Z+pi5OIQEtjNKPF77xEW kISQwCdGicO3WCES3xglWi79ZYbp2HzzICNEYi+jxLzzO9ggnB4miff3PjOCVLEJ6Es87ToP NkpEQE7i5MsLYN3MAq4SB97NBYsLC4RJ3G5dxwpiswioSmz7N50JYoOcxM1znVDbLrJKfD4h BmLzCpRJTHv5iA0i7iJxenUDVL2wxKvjW9ghbCmJz+/2gh0kIdAM9MLxuewQzgRGiaenzjBC VNlLtB3bDXQFB9BFmhLrd+lDhGUlpp5axwRxKJ9E7+8nUAt4JXbMg7FVJDofz2aFWfbn+kao gzwkHm6F6BUSiJWYtKuXcQKj7CyEDQsYGVcxSqYWFOempxabFhjnpZbrFSfmFpfmpesl5+du YgQnGi3vHYybzvkcYhTgYFTi4fXQrokWYk0sK67MPcQowcGsJML7fDNQiDclsbIqtSg/vqg0 J7X4EKMpMAQnMkuJJucDk2BeSbyhqZGZmYGlgamxhZmhkjjvB7/gaCGB9MSS1OzU1ILUIpg+ Jg5OqQbGiimK1hO0xcIi5SNncBhcX76EnSfx/OmpPRvZDEuzy1VE7PiCpp5jnGr98HXVK2Xz q+u/fVDaee6F8ZsZmiyzrpudXvto3r3X+qZtz+73/Nstc1EhovKfr7rHzY9ZbnuWnQi7HMHe qsKfd2iW6UnV2lllOmcyjrxYcJK1LLZy+7zJ1RcmH5p+RImlOCPRUIu5qDgRAFRtnKRKAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBJMWRmVeSWpSXmKPExsWy7bCSnO6Un9XRBt2d1hZrH6VZbF2yn8ni 1o1+Fgdmj81L6j36tqxiDGCK4rJJSc3JLEst0rdL4MpoeLWQsWAOT8WWN/OYGhg/c3YxcnJI CJhIbL55kLGLkYtDSGA3o8TuxUtZIBJSEvtvnmKDsIUlVv57zg5R1MUkMXPbUnaQBJuAvsTT rvNgDSICchInX15gBrGZBdwlfnd+AGsWFgiRaL82GayGRUBVYtu/6UwgNq+Am8ShaduZIRbI Sdw818k8gZFnASPDKkbJ1ILi3PTcYsMCw7zUcr3ixNzi0rx0veT83E2MYP9rae5gvLwk/hCj AAejEg/vgUtV0UKsiWXFlbmHGCU4mJVEeBedr44W4k1JrKxKLcqPLyrNSS0+xCjNwaIkzvs0 71ikkEB6YklqdmpqQWoRTJaJg1OqgbFO133uwyvf/vC3d/Acnlt2lGUR0wsZk6BM70nNZcuN 5h9Y/TPpvsPyd1rFl9fsv67ZaJDpcGJbEXv18hNz+LXCL2/YwhW/JVr8aNuU3kM2MWbdhRfK N3Z4M0kbaQXzfnv02dhgwo//T7ouHk349TP++FXd6ZyblkY/m/Dao34D790zstV9om5KLMUZ iYZazEXFiQBTRG+j+wEAAA== Message-Id: <20180821113757epcas5p31daaead102d4d9cf9b0423e39272c087~M40lRJ4rA3204732047epcas5p39@epcas5p3.samsung.com> X-CMS-MailID: 20180821113757epcas5p31daaead102d4d9cf9b0423e39272c087 X-Msg-Generator: CA X-Sendblock-Type: REQ_APPROVE CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20180821113757epcas5p31daaead102d4d9cf9b0423e39272c087 References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180821_201333_290390_144B9F15 X-CRM114-Status: GOOD ( 14.42 ) X-Spam-Score: -5.1 (-----) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-5.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 T_DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nishant Chaprana , sachin.dev@samsung.com MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Description: hash variable is allocated memory using eap_pwd_h_init(). But there are code path which skips deallocation of hash after usage. The memory of hash is deallocated using eap_pwd_h_final(). Signed-off-by: Nishant Chaprana --- src/eap_peer/eap_pwd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c index 90ac3cf..761c16a 100644 --- a/src/eap_peer/eap_pwd.c +++ b/src/eap_peer/eap_pwd.c @@ -696,7 +696,7 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data, const struct wpabuf *reqData, const u8 *payload, size_t payload_len) { - struct crypto_hash *hash; + struct crypto_hash *hash = NULL; u32 cs; u16 grp; u8 conf[SHA256_MAC_LEN], *cruft = NULL, *ptr; @@ -783,6 +783,7 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data, /* random function fin */ eap_pwd_h_final(hash, conf); + hash = NULL; ptr = (u8 *) payload; if (os_memcmp_const(conf, ptr, SHA256_MAC_LEN)) { @@ -836,6 +837,7 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data, /* all done */ eap_pwd_h_final(hash, conf); + hash = NULL; if (compute_keys(data->grp, data->k, data->my_scalar, data->server_scalar, conf, ptr, @@ -860,6 +862,10 @@ fin: } else { eap_pwd_state(data, SUCCESS_ON_FRAG_COMPLETION); } + + /* clean allocated memory */ + if (hash) + eap_pwd_h_final(hash, conf); }