From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 971BCC3A59F for ; Thu, 29 Aug 2019 18:22:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66F8E2173E for ; Thu, 29 Aug 2019 18:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102920; bh=aSTbXKvKg5UwjGjUDYjLCTiumbAZVtboOQDwsteLWwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mFljlbEA85v+vW6QxouDIKiaPc7SprSaWJeA7dQidLbfjss+Z7MGqTlhqOTCj09s7 zhCY7HhxdKee/uWyx2fYUipAMcDUZ1/pyCfeANOArdc/+4/xg8h4bJSkwZ6WHVHgW3 +Pl4XywtNTvvJBC7w31guvlld4ExCIaydKxvaic8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729254AbfH2SRZ (ORCPT ); Thu, 29 Aug 2019 14:17:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:59546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730024AbfH2SRV (ORCPT ); Thu, 29 Aug 2019 14:17:21 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 36434233FF; Thu, 29 Aug 2019 18:17:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102640; bh=aSTbXKvKg5UwjGjUDYjLCTiumbAZVtboOQDwsteLWwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZyyaLPm35M8g0GlCEMBkRkTTwqgWe22jYWnw1DUW9Px4d4NP6T7hu6vQtD522T4P4 oMXcJF/Jtnj1GCa8U7UKY+eaE53algdSmINHGX5qkq6HQ1fGERXMK/3SS7DtrrXK7v gw5pKTy/c3P5lacE0/otcYDRZ+WEq0VVJovX+A4o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenwen Wang , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 17/27] wimax/i2400m: fix a memory leak bug Date: Thu, 29 Aug 2019 14:16:43 -0400 Message-Id: <20190829181655.8741-17-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190829181655.8741-1-sashal@kernel.org> References: <20190829181655.8741-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wenwen Wang [ Upstream commit 44ef3a03252844a8753479b0cea7f29e4a804bdc ] In i2400m_barker_db_init(), 'options_orig' is allocated through kstrdup() to hold the original command line options. Then, the options are parsed. However, if an error occurs during the parsing process, 'options_orig' is not deallocated, leading to a memory leak bug. To fix this issue, free 'options_orig' before returning the error. Signed-off-by: Wenwen Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/wimax/i2400m/fw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index a89b5685e68b3..4577ee5bbddd6 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c @@ -351,13 +351,15 @@ int i2400m_barker_db_init(const char *_options) } result = i2400m_barker_db_add(barker); if (result < 0) - goto error_add; + goto error_parse_add; } kfree(options_orig); } return 0; +error_parse_add: error_parse: + kfree(options_orig); error_add: kfree(i2400m_barker_db); return result; -- 2.20.1