81 lines
3.4 KiB
Diff
81 lines
3.4 KiB
Diff
From patchwork Fri Oct 25 20:42:42 2019
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
|
X-Patchwork-Id: 1184451
|
|
X-Patchwork-Delegate: davem@davemloft.net
|
|
Return-Path: <netdev-owner@vger.kernel.org>
|
|
X-Original-To: patchwork-incoming-netdev@ozlabs.org
|
|
Delivered-To: patchwork-incoming-netdev@ozlabs.org
|
|
Authentication-Results: ozlabs.org; spf=none (no SPF record)
|
|
smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67;
|
|
helo=vger.kernel.org;
|
|
envelope-from=netdev-owner@vger.kernel.org;
|
|
receiver=<UNKNOWN>)
|
|
Authentication-Results: ozlabs.org;
|
|
dmarc=fail (p=none dis=none) header.from=intel.com
|
|
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
|
|
by ozlabs.org (Postfix) with ESMTP id 470GJz096Tz9sPf
|
|
for <patchwork-incoming-netdev@ozlabs.org>;
|
|
Sat, 26 Oct 2019 07:42:59 +1100 (AEDT)
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
|
id S1728655AbfJYUmz (ORCPT
|
|
<rfc822;patchwork-incoming-netdev@ozlabs.org>);
|
|
Fri, 25 Oct 2019 16:42:55 -0400
|
|
Received: from mga11.intel.com ([192.55.52.93]:22523 "EHLO mga11.intel.com"
|
|
rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
|
|
id S1728604AbfJYUmq (ORCPT <rfc822;netdev@vger.kernel.org>);
|
|
Fri, 25 Oct 2019 16:42:46 -0400
|
|
X-Amp-Result: SKIPPED(no attachment in message)
|
|
X-Amp-File-Uploaded: False
|
|
Received: from orsmga006.jf.intel.com ([10.7.209.51])
|
|
by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
|
|
25 Oct 2019 13:42:46 -0700
|
|
X-ExtLoop1: 1
|
|
X-IronPort-AV: E=Sophos;i="5.68,229,1569308400"; d="scan'208";a="202713981"
|
|
Received: from jtkirshe-desk1.jf.intel.com ([134.134.177.96])
|
|
by orsmga006.jf.intel.com with ESMTP; 25 Oct 2019 13:42:44 -0700
|
|
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
|
To: davem@davemloft.net
|
|
Cc: Navid Emamdoost <navid.emamdoost@gmail.com>,
|
|
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
|
|
Andrew Bowers <andrewx.bowers@intel.com>,
|
|
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
|
Subject: [net-next v2 9/9] i40e: prevent memory leak in i40e_setup_macvlans
|
|
Date: Fri, 25 Oct 2019 13:42:42 -0700
|
|
Message-Id: <20191025204242.10535-10-jeffrey.t.kirsher@intel.com>
|
|
X-Mailer: git-send-email 2.21.0
|
|
In-Reply-To: <20191025204242.10535-1-jeffrey.t.kirsher@intel.com>
|
|
References: <20191025204242.10535-1-jeffrey.t.kirsher@intel.com>
|
|
MIME-Version: 1.0
|
|
Sender: netdev-owner@vger.kernel.org
|
|
Precedence: bulk
|
|
List-ID: <netdev.vger.kernel.org>
|
|
X-Mailing-List: netdev@vger.kernel.org
|
|
|
|
From: Navid Emamdoost <navid.emamdoost@gmail.com>
|
|
|
|
In i40e_setup_macvlans if i40e_setup_channel fails the allocated memory
|
|
for ch should be released.
|
|
|
|
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
|
|
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
|
|
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
|
---
|
|
drivers/net/ethernet/intel/i40e/i40e_main.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
|
|
index 2e4df0bd8d37..141575ada588 100644
|
|
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
|
|
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
|
|
@@ -7187,6 +7187,7 @@ static int i40e_setup_macvlans(struct i40e_vsi *vsi, u16 macvlan_cnt, u16 qcnt,
|
|
ch->num_queue_pairs = qcnt;
|
|
if (!i40e_setup_channel(pf, vsi, ch)) {
|
|
ret = -EINVAL;
|
|
+ kfree(ch);
|
|
goto err_free;
|
|
}
|
|
ch->parent_vsi = vsi;
|