From patchwork Tue Jan 12 01:01:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 8013081 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 77B7EBEEE5 for ; Tue, 12 Jan 2016 01:02:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9BD7020145 for ; Tue, 12 Jan 2016 01:02:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99D74201BB for ; Tue, 12 Jan 2016 01:02:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761755AbcALBB6 (ORCPT ); Mon, 11 Jan 2016 20:01:58 -0500 Received: from m12-18.163.com ([220.181.12.18]:48650 "EHLO m12-18.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751717AbcALBB5 (ORCPT ); Mon, 11 Jan 2016 20:01:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=njjbhstgT+Q5EOqqtZ 7N/n93tBce+eBoyp2VQLIHDuE=; b=VFUgVKDWyezkDGDZ4fw2kwzU1zam031WPk soEVD/fUyhV+4ZbeF5ZD+NvCGLo9jQ5ibEVBmrMaezl/IRxxmdNRYUgt2KCkbsXs FuIfISfDbngaiY+w9ZEIl2gOyFOq2u82ScgMtFdFw89yRtFKErDAzILJkE25OHmw bVWAtCs/U= Received: from bai-oslab.tsinghua.edu.cn (unknown [166.111.70.58]) by smtp14 (Coremail) with SMTP id EsCowEBJF3E5UJRWnmTCAA--.1830S2; Tue, 12 Jan 2016 09:00:47 +0800 (CST) From: Jia-Ju Bai To: kvalo@codeaurora.org, zajec5@gmail.com, joe@perches.com, davem@davemloft.net, m@bues.ch, johannes.berg@intel.com Cc: linux-wireless@vger.kernel.org, b43-dev@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jia-Ju Bai Subject: [PATCH] b43: Fix memory leaks in b43_bus_dev_ssb_init and b43_bus_dev_bcma_init Date: Tue, 12 Jan 2016 09:01:04 +0800 Message-Id: <1452560464-7146-1-git-send-email-baijiaju1990@163.com> X-Mailer: git-send-email 1.7.9.5 X-CM-TRANSID: EsCowEBJF3E5UJRWnmTCAA--.1830S2 X-Coremail-Antispam: 1Uf129KBjvJXoWrtw4UZry7GFyxJF4kKw1xKrg_yoW8Jr13pF 4DG3Wjkw4xGr1UC3yrCF4IyF15X3Z7tryqgFW2v3s3Wa95Ar1rGr15Za4xZryYyFW8Ca13 ZrWjy34UGFZ8GFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UfR6cUUUUU= X-Originating-IP: [166.111.70.58] X-CM-SenderInfo: xedlyx5dmximizq6il2tof0z/1tbiZQDtelWBOOMnVgAAsM Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The memory allocated by kzalloc in b43_bus_dev_ssb_init and b43_bus_dev_bcma_initis not freed. This patch fixes the bug by adding kfree in b43_ssb_remove, b43_bcma_remove and error handling code of b43_bcma_probe. Thanks Michael for his suggestion. Signed-off-by: Jia-Ju Bai --- drivers/net/wireless/b43/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index ec013fb..2c9d9c1 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -5683,6 +5683,7 @@ static int b43_bcma_probe(struct bcma_device *core) schedule_work(&wl->firmware_load); bcma_out: + kfree(dev); return err; bcma_err_wireless_exit: @@ -5716,6 +5717,7 @@ static void b43_bcma_remove(struct bcma_device *core) b43_leds_unregister(wl); ieee80211_free_hw(wl->hw); + kfree(wldev->dev); } static struct bcma_driver b43_bcma_driver = { @@ -5798,6 +5800,7 @@ static void b43_ssb_remove(struct ssb_device *sdev) b43_leds_unregister(wl); b43_wireless_exit(dev, wl); + kfree(dev); } static struct ssb_driver b43_ssb_driver = {