From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 4D595A0C41
for <public@inbox.dpdk.org>; Mon, 12 Apr 2021 03:55:17 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 4193D4069D;
Mon, 12 Apr 2021 03:55:16 +0200 (CEST)
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
by mails.dpdk.org (Postfix) with ESMTP id 6484A4069D
for <stable@dpdk.org>; Mon, 12 Apr 2021 03:55:15 +0200 (CEST)
IronPort-SDR: cJ9foniRGDmMD23h8S0eFTIaywmNL44Auu70gOOUB6FmzqI2M51v8DSFk7/M2K8VlJ/XMQdnMO
E0J+q1GJSalQ==
X-IronPort-AV: E=McAfee;i="6000,8403,9951"; a="279386912"
X-IronPort-AV: E=Sophos;i="5.82,214,1613462400"; d="scan'208";a="279386912"
Received: from orsmga008.jf.intel.com ([10.7.209.65])
by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
11 Apr 2021 18:55:14 -0700
IronPort-SDR: OOU2vBQKRxRtwnPThXgODqbTesWCcN+Gr2fr8hWvsCa8psrVdwCKTFqZBo1f9mE+VXENZjcwib
yNnAdLfMVVJA==
X-IronPort-AV: E=Sophos;i="5.82,214,1613462400"; d="scan'208";a="423588998"
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 18:55:11 -0700
From: Wenwu Ma <wenwux.ma@intel.com>
To: build_sh@intel.com
Cc: alvinx.zhang@intel.com,
Wenwu Ma <wenwux.ma@intel.com>,
stable@dpdk.org
Date: Mon, 12 Apr 2021 13:48:42 +0000
Message-Id: <20210412134842.258783-1-wenwux.ma@intel.com>
X-Mailer: git-send-email 2.25.1
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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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 <wenwux.ma@intel.com>
---
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 <sys/stat.h>
#include <unistd.h>
+#include <rte_tailq.h>
+
#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