From patchwork Wed Aug 5 14:05:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 504027 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D5A801402C2 for ; Thu, 6 Aug 2015 00:05:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=VGZ3Wr2P; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752061AbbHEOFg (ORCPT ); Wed, 5 Aug 2015 10:05:36 -0400 Received: from m12-18.163.com ([220.181.12.18]:36643 "EHLO m12-18.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751486AbbHEOFf (ORCPT ); Wed, 5 Aug 2015 10:05:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=mzhtRCCb4uP+eNbl3Y znfD1T/pcYR/izfnqqriKXLRU=; b=VGZ3Wr2PLhyK2wTdbFSTRpsTuqqEvDR0Ug VNZadjd9VC/97nma8XR0DvB/aa9gT09FAQzpcaWKdsNuZn3vgv4mmh5YDbb1Wri/ XbJHkC8xsNS0HZAuKPz2NIuq6rGQzCjMylDuSDscLzKOHlCZqmMMN0V9ovMUxSEC s7pvvWuPY= Received: from bai-oslab.tsinghua.edu.cn (unknown [166.111.70.58]) by smtp14 (Coremail) with SMTP id EsCowEAJwEMcGMJVNiyCAg--.20474S2; Wed, 05 Aug 2015 22:05:22 +0800 (CST) From: Jia-Ju Bai To: jeffrey.t.kirsher@intel.com, jesse.brandeburg@intel.com Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jia-Ju Bai Subject: [PATCH] igb: Fix a memory leak in igb_probe Date: Wed, 5 Aug 2015 22:05:16 +0800 Message-Id: <1438783516-13283-1-git-send-email-baijiaju1990@163.com> X-Mailer: git-send-email 1.7.9.5 X-CM-TRANSID: EsCowEAJwEMcGMJVNiyCAg--.20474S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrZrWxXr4fJFW3Zr45XF4fXwb_yoWfWrb_uw 12vFWxJanxGw1Fkw4Yyr42v3yq9r1v9ryfAr4akFWSkwn7Cw17Ww1DZr13XrZ5WrWfCasr Cr1agFy2y34jkjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUj6pBDUUUUU== X-Originating-IP: [166.111.70.58] X-CM-SenderInfo: xedlyx5dmximizq6il2tof0z/xtbBRQNNelO-wXjiNgAAsw Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In error handling code of igb_probe, the memory adapter->shadow_vfta allocated by kcalloc in igb_sw_init is not freed. So when register_netdev or igb_init_i2c is failed, a memory leak will occur. This patch adds kfree to fix it. Signed-off-by: Jia-Ju Bai Tested-by: Aaron Brown --- drivers/net/ethernet/intel/igb/igb_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 2f70a9b..3efb757 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2645,6 +2645,7 @@ err_eeprom: if (hw->flash_address) iounmap(hw->flash_address); err_sw_init: + kfree(adapter->shadow_vfta); igb_clear_interrupt_scheme(adapter); pci_iounmap(pdev, hw->hw_addr); err_ioremap: