From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E729AA0C42 for ; Mon, 12 Apr 2021 04:17:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA8024069D; Mon, 12 Apr 2021 04:17:14 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 4228E4069D for ; Mon, 12 Apr 2021 04:17:13 +0200 (CEST) IronPort-SDR: YtjYnxnUvvaMS3sSdpO+SuOzeUsm01ufyA9bvjvxpIABZ4YtRAVtJHN72xOOuTh9GilIyQguU7 AwdIJsCUI3PA== X-IronPort-AV: E=McAfee;i="6000,8403,9951"; a="258071739" X-IronPort-AV: E=Sophos;i="5.82,214,1613462400"; d="scan'208";a="258071739" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2021 19:17:12 -0700 IronPort-SDR: CXWeUaP1wvmXe1uneOkx94tA0/NPaLyqcddWYV2wYHe7ne1/Zc9uGRVymrVgO718exDt/+ZGhZ QH/UwGHCCLfQ== X-IronPort-AV: E=Sophos;i="5.82,214,1613462400"; d="scan'208";a="423592900" Received: from unknown (HELO localhost.localdomain) ([10.240.183.109]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2021 19:17:10 -0700 From: Wenwu Ma To: build_sh@intel.com Cc: Wenwu Ma , stable@dpdk.org Date: Mon, 12 Apr 2021 14:10:58 +0000 Message-Id: <20210412141058.259021-1-wenwux.ma@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210402135247.20094-1-wenwux.ma@intel.com> References: <20210402135247.20094-1-wenwux.ma@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v1] net/ice: fix illegal memory access when releasing vsi X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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" When iterating the vsi->mac_list to find and delete its members, TAILQ_FOREACH_SAFE should be used instead of TAILQ_FOREACH, Otherwise, it will result in access to memory that has been freed. Fixes: e0dcf94a0d7f ("net/ice: support VLAN ops") Cc: stable@dpdk.org Signed-off-by: Wenwu Ma --- v1: * Refine commit log. 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; -- 2.25.1