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 27A7EA056D for ; Tue, 3 Mar 2020 06:45:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 001101C00F; Tue, 3 Mar 2020 06:45:20 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id D960A1BFF0; Tue, 3 Mar 2020 06:45:17 +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 fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2020 21:45:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,510,1574150400"; d="scan'208";a="351745274" Received: from dpdk-zhutao-d.sh.intel.com ([10.240.179.19]) by fmsmga001.fm.intel.com with ESMTP; 02 Mar 2020 21:45:14 -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:38:46 +0800 Message-Id: <20200303053846.10610-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-stable] [PATCH v3] net/ice: fix hash flow segmentation fault X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- v3 Changes: Commit message: Use 12 chars length of commit SHA in Fixes line. Code: Delete redundant assignment codes. v2 Changes: Commit message: Use 12 chars length of commit SHA in Fixes line. drivers/net/ice/ice_hash.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index d891538bd..0e9c3c4e5 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,8 +424,10 @@ 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) -- 2.17.1