From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7A02AA056D; Tue, 3 Mar 2020 04:34:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D80DE1BFF4; Tue, 3 Mar 2020 04:34:22 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 729661BFF3; Tue, 3 Mar 2020 04:34:21 +0100 (CET) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2020 19:34:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,509,1574150400"; d="scan'208";a="274029644" Received: from yexl-server.sh.intel.com (HELO localhost) ([10.67.117.17]) by fmsmga002.fm.intel.com with ESMTP; 02 Mar 2020 19:34:16 -0800 Date: Tue, 3 Mar 2020 11:32:06 +0800 From: Ye Xiaolong To: taox.zhu@intel.com Cc: qiming.yang@intel.com, wenzhuo.lu@intel.com, dev@dpdk.org, simei.su@intel.com, yahui.cao@intel.com, stable@dpdk.org Message-ID: <20200303033206.GF25927@intel.com> References: <20200303015557.63621-1-taox.zhu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200303015557.63621-1-taox.zhu@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-dev] [DPDK] net/ice: fix hash flow segmentation fault X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 03/03, taox.zhu@intel.com wrote: >From: Zhu Tao > >Macro rte_errno is not a static value, so it needs to be updated in all >error handling code. > >Patch 'dc36bd5dfd' mistakenly consider that rte_errno is a constant, which >causes the unrecognized flow rule to be marked as recognition success. >Later, when the code tried to parse the flow rule, a null pointer caused >a segmentation fault. > >Fixes: dc36bd5dfd ("net/ice: fix flow FDIR/switch memory leak") It's recommended to have 12 chars length of commit SHA in Fixes line. You can set below git alias for convenience. git config alias.fixline "log -1 --abbrev=12 --format='Fixes: %h (\"%s\")%nCc: %ae'" >Cc: stable@dpdk.org > >Signed-off-by: Zhu Tao >--- > drivers/net/ice/ice_hash.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > >diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c >index d891538bd..e5fb0f344 100644 >--- a/drivers/net/ice/ice_hash.c >+++ b/drivers/net/ice/ice_hash.c >@@ -409,7 +409,7 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad, > void **meta, > struct rte_flow_error *error) > { >- int ret = -rte_errno; >+ int ret = 0; > struct ice_pattern_match_item *pattern_match_item; > struct rss_meta *rss_meta_ptr; > >@@ -424,12 +424,16 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad, > /* Check rss supported pattern and find matched pattern. */ > pattern_match_item = ice_search_pattern_match_item(pattern, > array, array_len, error); >- if (!pattern_match_item) >+ if (!pattern_match_item) { >+ ret = -rte_errno; > goto error; >+ } > > ret = ice_hash_check_inset(pattern, error); >- if (ret) >+ if (ret) { >+ ret = -rte_errno; This seems redundant, since ice_hash_check_inset would return -rte_errno directly. > goto error; >+ } > > /* Save protocol header to rss_meta. */ > *meta = rss_meta_ptr; >@@ -439,8 +443,10 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad, > /* Check rss action. */ > ret = ice_hash_parse_action(pattern_match_item, actions, meta, error); > error: >- if (ret) >+ if (ret) { >+ ret = -rte_errno; Ditto. > rte_free(rss_meta_ptr); >+ } > rte_free(pattern_match_item); > > return ret; >-- >2.17.1 >