Intel-Wired-Lan Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH S43 13/15] ice: Fix memory leak
Date: Fri, 15 May 2020 17:36:42 -0700	[thread overview]
Message-ID: <20200516003644.4658-13-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20200516003644.4658-1-anthony.l.nguyen@intel.com>

From: Surabhi Boob <surabhi.boob@intel.com>

Handle memory leak on filter management initialization failure.

Signed-off-by: Surabhi Boob <surabhi.boob@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
 drivers/net/ethernet/intel/ice/ice_common.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index bba787a6faff..b0bbba8e6f6c 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -387,6 +387,7 @@ ice_aq_set_mac_cfg(struct ice_hw *hw, u16 max_frame_size, struct ice_sq_cd *cd)
 static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)
 {
 	struct ice_switch_info *sw;
+	enum ice_status status;
 
 	hw->switch_info = devm_kzalloc(ice_hw_to_dev(hw),
 				       sizeof(*hw->switch_info), GFP_KERNEL);
@@ -397,7 +398,12 @@ static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)
 
 	INIT_LIST_HEAD(&sw->vsi_list_map_head);
 
-	return ice_init_def_sw_recp(hw);
+	status = ice_init_def_sw_recp(hw);
+	if (status) {
+		devm_kfree(ice_hw_to_dev(hw), hw->switch_info);
+		return status;
+	}
+	return 0;
 }
 
 /**
-- 
2.20.1


  parent reply	other threads:[~2020-05-16  0:36 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-16  0:36 [Intel-wired-lan] [PATCH S43 01/15] ice: Call ice_aq_set_mac_cfg Tony Nguyen
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 02/15] ice: print Rx MDD auto reset message before VF reset Tony Nguyen
2020-05-22 19:27   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 03/15] ice: Fix Tx timeout when link is toggled on a VF's interface Tony Nguyen
2020-05-22 19:30   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 04/15] ice: Check if unicast MAC exists before setting VF MAC Tony Nguyen
2020-05-22 19:30   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 05/15] ice: check for compatibility between DDP package and firmware Tony Nguyen
2020-05-22 19:31   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 06/15] ice: Fix bad register reads Tony Nguyen
2020-05-22 19:56   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 07/15] ice: fix usage of incorrect variable Tony Nguyen
2020-05-22 19:58   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 08/15] ice: cleanup unsigned loops Tony Nguyen
2020-05-22 19:58   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 09/15] ice: fix signed vs unsigned comparisons Tony Nguyen
2020-05-22 19:58   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 10/15] ice: remove unused macro Tony Nguyen
2020-05-22 20:06   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 11/15] ice: set VF default LAN address Tony Nguyen
2020-05-22 20:07   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 12/15] ice: fix MAC write command Tony Nguyen
2020-05-22 20:07   ` Bowers, AndrewX
2020-05-16  0:36 ` Tony Nguyen [this message]
2020-05-22 20:08   ` [Intel-wired-lan] [PATCH S43 13/15] ice: Fix memory leak Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 14/15] ice: Fix for memory leaks and modify ICE_FREE_CQ_BUFS Tony Nguyen
2020-05-22 20:09   ` Bowers, AndrewX
2020-05-16  0:36 ` [Intel-wired-lan] [PATCH S43 15/15] ice: Add more Rx errors to netdev's rx_error counter Tony Nguyen
2020-05-22 20:09   ` Bowers, AndrewX
2020-05-22 19:14 ` [Intel-wired-lan] [PATCH S43 01/15] ice: Call ice_aq_set_mac_cfg Bowers, AndrewX

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200516003644.4658-13-anthony.l.nguyen@intel.com \
    --to=anthony.l.nguyen@intel.com \
    --cc=intel-wired-lan@osuosl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox