From patchwork Fri Apr 2 13:52:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ma, WenwuX" X-Patchwork-Id: 90441 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 27048A0548; Fri, 2 Apr 2021 03:59:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C2EEB40F35; Fri, 2 Apr 2021 03:59:07 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 3EA8440150 for ; Fri, 2 Apr 2021 03:59:06 +0200 (CEST) IronPort-SDR: nFyAmW7eCig4c+JNLC/HLYkG3GdK6+d9h/Fvu5hZwvzkZDvSLEFHPfmh3EjKfa9Jt+azMz032H g85EUdCnNKag== X-IronPort-AV: E=McAfee;i="6000,8403,9941"; a="189114477" X-IronPort-AV: E=Sophos;i="5.81,298,1610438400"; d="scan'208";a="189114477" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 18:59:05 -0700 IronPort-SDR: ak49tWAO9sGNsLU30RfGJmYALy45MyKOMYSyJSQPulmPPAL9vZOXVD6cln3ZYGj91QBuZai+2l 0Gus4KSJ4KdQ== X-IronPort-AV: E=Sophos;i="5.81,298,1610438400"; d="scan'208";a="419463162" Received: from unknown (HELO localhost.localdomain) ([10.240.183.109]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 18:59:03 -0700 From: Wenwu Ma To: qiming.yang@intel.com, qi.z.zhang@intel.com Cc: dev@dpdk.org Date: Fri, 2 Apr 2021 13:52:47 +0000 Message-Id: <20210402135247.20094-1-wenwux.ma@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] net/ice: fix illegal pointer access when removing mac filter 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 Sender: "dev" When removing the mac filter in ice_remove_all_mac_vlan_filters(), TAILQ_FOREACH_SAFE should be used instead of TAILQ_FOREACH, Otherwise, it will result in a illegal pointer access. Fixes: e0dcf94a0d7f ("net/ice: support VLAN ops") Cc: stable@dpdk.org Signed-off-by: Wenwu Ma Signed-off-by: Wenwu Ma Tested-by: Peng Zhihong --- drivers/net/ice/ice_ethdev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 9c9b84a93..785750d9b 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -10,6 +10,8 @@ #include #include +#include + #include "base/ice_sched.h" #include "base/ice_flow.h" #include "base/ice_dcb.h" @@ -1094,12 +1096,13 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi) { struct ice_mac_filter *m_f; struct ice_vlan_filter *v_f; + void *temp; int ret = 0; if (!vsi || !vsi->mac_num) return -EINVAL; - TAILQ_FOREACH(m_f, &vsi->mac_list, next) { + TAILQ_FOREACH_SAFE(m_f, &vsi->mac_list, next, temp) { ret = ice_remove_mac_filter(vsi, &m_f->mac_info.mac_addr); if (ret != ICE_SUCCESS) { ret = -EINVAL; @@ -1110,7 +1113,7 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi) if (vsi->vlan_num == 0) return 0; - TAILQ_FOREACH(v_f, &vsi->vlan_list, next) { + TAILQ_FOREACH_SAFE(v_f, &vsi->vlan_list, next, temp) { ret = ice_remove_vlan_filter(vsi, &v_f->vlan_info.vlan); if (ret != ICE_SUCCESS) { ret = -EINVAL;