diff mbox series

[21/27] net/ice/base: fix for dereference of null pointer

Message ID	20201215060519.302145-22-qi.z.zhang@intel.com (mailing list archive)
State	Accepted, archived
Delegated to:	Qi Zhang
Headers	IronPort-SDR: rRgnfsQ98DbOu0d9b5SRaLWIeEKrV/Z6kZ44mXi2rYlJZWaVOJcZNu16zWiFepWEUxsEkbuCNK 37rN9nxH3J+Q== IronPort-SDR: kvSb+EQ9IlKP9LM5ILBXd6Ft6bgsSEF1yvqQw5hU3Hgw+2IpbUKm9NIqVieM8//GrpPGp1KUB8 j4Wuzo1Lv/WA== From: Qi Zhang <qi.z.zhang@intel.com> To: qiming.yang@intel.com Cc: dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>, stable@dpdk.org, =?utf-8?q?Jacek_Bu=C5=82atek?= <jacekx.bulatek@intel.com>, Haiyue Wang <haiyue.wang@intel.com> Date: Tue, 15 Dec 2020 14:05:13 +0800 Message-Id: <20201215060519.302145-22-qi.z.zhang@intel.com> In-Reply-To: <20201215060519.302145-1-qi.z.zhang@intel.com> References: <20201215060519.302145-1-qi.z.zhang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 21/27] net/ice/base: fix for dereference of null pointer Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	ice base code update \| [00/27] ice base code update [01/27] net/ice/base: modify ptype map for UDP [02/27] net/ice/base: increased control queue timeout [03/27] net/ice/base: read more security revision options [04/27] net/ice/base: refactor interface for flash read [05/27] net/ice/base: allow reading inactive flash security revision [06/27] net/ice/base: allow reading arbitrary size data with flash read [07/27] net/ice/base: read Option ROM combo version from CIVD section [08/27] net/ice/base: implement inactive NVM version get [09/27] net/ice/base: support GTP filtering via advanced switch filter [10/27] net/ice/base: cleanup some macros [11/27] net/ice/base: add definitions for FW health status codes [12/27] net/ice/base: add function for NVM checksum verification [13/27] net/ice/base: add condition to copy module info into memory [14/27] net/ice/base: add interface to support configuring VLAN mode [15/27] net/ice/base: support VXLAN VNI field in FDIR [16/27] net/ice/base: fix incorrect tunnel destroy [17/27] net/ice/base: add functionality to check if DVM is supported [18/27] net/ice/base: resend some AQ commands when EBUSY [19/27] net/ice/base: change get PHY capability error level [20/27] net/ice/base: modify recursive way of adding nodes [21/27] net/ice/base: fix for dereference of null pointer [22/27] net/ice/base: use Mode 4 to get PHY Abilites [23/27] net/ice/base: align macro names to the specification [24/27] net/ice/base: add eCPRI over MAC type 0 flow support [25/27] net/ice/base: add eCPRI over UDP type 0 flow support [26/27] net/ice/base: remove unused struct member [27/27] net/ice/base: change a structure

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Qi Zhang Dec. 15, 2020, 6:05 a.m. UTC

  Added handling of allocation fault for ice_vsi_list_map_info
Should also check dereference of NULL pointer to filters VSI list
information for FWD_TO_VSI_LISt type only, otherwise, the FWD_TO_VSI type
filters by the given VSI can't be located.

Also the point *pi should not be NULL pointer, it is a reference to raw
data field, so remove this variable, use the reference directly.

Fixes: c7dd15931183 ("net/ice/base: add virtual switch code")
Cc: stable@dpdk.org

Signed-off-by: Jacek Bułatek <jacekx.bulatek@intel.com>
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/base/ice_switch.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index 45c44ca256..fd2c1ccceb 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -4090,6 +4090,9 @@  ice_add_update_vsi_list(struct ice_hw *hw,
 			ice_create_vsi_list_map(hw, &vsi_handle_arr[0], 2,
 						vsi_list_id);
 
+		if (!m_entry->vsi_list_info)
+			return ICE_ERR_NO_MEMORY;
+
 		/* If this entry was large action then the large action needs
 		 * to be updated to point to FWD to VSI list
 		 */
@@ -5423,6 +5426,7 @@  ice_vsi_uses_fltr(struct ice_fltr_mgmt_list_entry *fm_entry, u16 vsi_handle)
 	return ((fm_entry->fltr_info.fltr_act == ICE_FWD_TO_VSI &&
 		 fm_entry->fltr_info.vsi_handle == vsi_handle) ||
 		(fm_entry->fltr_info.fltr_act == ICE_FWD_TO_VSI_LIST &&
+		 fm_entry->vsi_list_info &&
 		 (ice_is_bit_set(fm_entry->vsi_list_info->vsi_map,
 				 vsi_handle))));
 }
@@ -5497,14 +5501,12 @@  ice_add_to_vsi_fltr_list(struct ice_hw *hw, u16 vsi_handle,
 
 	LIST_FOR_EACH_ENTRY(fm_entry, lkup_list_head,
 			    ice_fltr_mgmt_list_entry, list_entry) {
-		struct ice_fltr_info *fi;
-
-		fi = &fm_entry->fltr_info;
-		if (!fi || !ice_vsi_uses_fltr(fm_entry, vsi_handle))
+		if (!ice_vsi_uses_fltr(fm_entry, vsi_handle))
 			continue;
 
 		status = ice_add_entry_to_vsi_fltr_list(hw, vsi_handle,
-							vsi_list_head, fi);
+							vsi_list_head,
+							&fm_entry->fltr_info);
 		if (status)
 			return status;
 	}