From patchwork Tue Mar 3 05:07:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhu, TaoX" X-Patchwork-Id: 66206 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D562DA056D; Tue, 3 Mar 2020 06:12:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 88C891BFF0; Tue, 3 Mar 2020 06:12:38 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 6C3A61BFEF; Tue, 3 Mar 2020 06:12:37 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2020 21:12:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,510,1574150400"; d="scan'208";a="351739294" Received: from dpdk-zhutao-d.sh.intel.com ([10.240.179.19]) by fmsmga001.fm.intel.com with ESMTP; 02 Mar 2020 21:12:33 -0800 From: taox.zhu@intel.com To: qiming.yang@intel.com, wenzhuo.lu@intel.com Cc: dev@dpdk.org, simei.su@intel.com, yahui.cao@intel.com, xiaolong.ye@intel.com, Zhu Tao , stable@dpdk.org Date: Tue, 3 Mar 2020 13:07:37 +0800 Message-Id: <20200303050737.9768-1-taox.zhu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200303015557.63621-1-taox.zhu@intel.com> References: <20200303015557.63621-1-taox.zhu@intel.com> Subject: [dpdk-dev] [PATCH v2] 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" From: Zhu Tao Macro rte_errno is not a static value, so it needs to be updated in all error handling code. Patch 'dc36bd5dfdeb' 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: dc36bd5dfdeb ("net/ice: fix flow FDIR/switch memory leak") Cc: stable@dpdk.org Signed-off-by: Zhu Tao --- v2 Changes: Commit message: Use 12 chars length of commit SHA in Fixes line. 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; 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; rte_free(rss_meta_ptr); + } rte_free(pattern_match_item); return ret;