From patchwork Thu Oct 19 09:24:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenjing Qiao X-Patchwork-Id: 132972 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DEB9B431A8; Thu, 19 Oct 2023 11:25:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70AD540279; Thu, 19 Oct 2023 11:25:24 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 43F984021F for ; Thu, 19 Oct 2023 11:25:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697707522; x=1729243522; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xsgBG0FhxB0fbAXEqki7+AlYQM7rU2BflSkOYdSmjRY=; b=C681hR4GDpf5WjnzCqF5Xb3LjpMj1+m8/iRrJQkyTGdYpW4mNCJVF/wV ozvPl86WwgdjA01RTvh1BcmDCNhJTCHOFglvrnHv2eUQf9Q5gMosdPvM+ 7SlHAfe9AvyST7oBV4NSfDAUAHY6Y4H71yyWn7Nn8Z8bMPQ9m3W1FJ1N6 ZgFsoCUmCirL3lYXaJ0XzUwNCG4fhlpret+OQphVAEpOI9UTFwN/GJ9Mx SN+ZZvNXQ0QSyIvj8LsX3ys0xy190ycqD06f8xKCe9wbuZT0yfFpMspyv PIF04FY0wsUYktgHUwrpnxggDDwGm2w94N4fDqqNBwT12F92WUCBVGKgP w==; X-IronPort-AV: E=McAfee;i="6600,9927,10867"; a="366449861" X-IronPort-AV: E=Sophos;i="6.03,236,1694761200"; d="scan'208";a="366449861" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2023 02:25:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10867"; a="760573909" X-IronPort-AV: E=Sophos;i="6.03,236,1694761200"; d="scan'208";a="760573909" Received: from dpdk-wenjing-02.sh.intel.com ([10.67.119.3]) by fmsmga007.fm.intel.com with ESMTP; 19 Oct 2023 02:25:19 -0700 From: wenjing.qiao@intel.com To: jingjing.wu@intel.com, beilei.xing@intel.com Cc: dev@dpdk.org, qi.z.zhang@intel.com, Wenjing Qiao Subject: [PATCH] net/cpfl: fix coverity issue 403269, 403270 and 403272 Date: Thu, 19 Oct 2023 09:24:19 +0000 Message-Id: <20231019092418.1477689-1-wenjing.qiao@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Wenjing Qiao Fix logically dead code and dereference before null check issues reported in coverity scan. Coverity issue: 403269 Coverity issue: 403270 Coverity issue: 403272 Fixes: 41f20298ee8c ("net/cpfl: parse flow offloading hint from JSON") Fixes: 6cc97c9971d7 ("net/cpfl: build action mapping rules from JSON") Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang --- drivers/net/cpfl/cpfl_ethdev.h | 3 +-- drivers/net/cpfl/cpfl_flow_parser.c | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/cpfl/cpfl_ethdev.h b/drivers/net/cpfl/cpfl_ethdev.h index efb0eb5251..6f5af4f7f3 100644 --- a/drivers/net/cpfl/cpfl_ethdev.h +++ b/drivers/net/cpfl/cpfl_ethdev.h @@ -280,7 +280,6 @@ cpfl_get_port_id(struct cpfl_itf *itf) static inline uint16_t cpfl_get_vsi_id(struct cpfl_itf *itf) { - struct cpfl_adapter_ext *adapter = itf->adapter; struct cpfl_vport_info *info; uint32_t vport_id; int ret; @@ -301,7 +300,7 @@ cpfl_get_vsi_id(struct cpfl_itf *itf) vport_identity.pf_id = CPFL_ACC_CPF_ID; vport_identity.vf_id = 0; vport_identity.vport_id = vport_id; - ret = rte_hash_lookup_data(adapter->vport_map_hash, + ret = rte_hash_lookup_data(itf->adapter->vport_map_hash, &vport_identity, (void **)&info); if (ret < 0) { diff --git a/drivers/net/cpfl/cpfl_flow_parser.c b/drivers/net/cpfl/cpfl_flow_parser.c index 0e623494a2..412f7feed0 100644 --- a/drivers/net/cpfl/cpfl_flow_parser.c +++ b/drivers/net/cpfl/cpfl_flow_parser.c @@ -844,8 +844,6 @@ cpfl_parser_destroy(struct cpfl_flow_js_parser *parser) for (i = 0; i < parser->pr_size; i++) { struct cpfl_flow_js_pr *pattern = &parser->patterns[i]; - if (!pattern) - continue; for (j = 0; j < pattern->key.proto_size; j++) rte_free(pattern->key.protocols[j].fields); rte_free(pattern->key.protocols); @@ -863,8 +861,6 @@ cpfl_parser_destroy(struct cpfl_flow_js_parser *parser) for (i = 0; i < parser->mr_size; i++) { struct cpfl_flow_js_mr *mr = &parser->modifications[i]; - if (!mr) - continue; rte_free(mr->key.actions); rte_free(mr->action.mod.layout); }