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 F2877A0A0E for ; Mon, 10 May 2021 18:21:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4FFD4014E; Mon, 10 May 2021 18:21:40 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2089.outbound.protection.outlook.com [40.107.237.89]) by mails.dpdk.org (Postfix) with ESMTP id 46E0F4014E for ; Mon, 10 May 2021 18:21:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFAt6Y+lWBhabDhokCTwT73xBmyMYbqdWn39lNgCjF9IiQO4RqRIUTE02ePI4pK0JRSGNW9YkyZRd87JS8Sx4oA+MrOQHFIn2PCtPbKhfld8ZXQ6SmxDPYI5iDTKbm9ODwlsJ2p6g9kUSMPcsZ1BO+xmud4/JvShbYMinavWMTRJ7EX7X5DuVAwwE/NXZVozkTR4HNnPOux3ggQIyI/llzTQ6pT7ydrXhSEL/2jH3FnIs51USwJtTNZin0lcCUnkkhQqQdNbepfcOlTRpCE+ByoGvnlysS62OlzoduIUbrurRppD8DAT/c7TIcZcUFxBF4oHjqmdA7n53pTiackjrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T/gVGN1/WEoMXrNzfMNcfwmH/T7wbIdcmAYdWDLz5L0=; b=DJXwIJEaWiwKsrwtFESoaNcTyw4PWon5Y9/gwopsfafz5MpA0ZYTtiXyM2faCR88xEb2UX4zwNfNZ/HBIXAhfgUNi7uMw9RqH+O2EH/WP9G5jZYDSpzxZIOB7PwoF/vNgZNaJvf/rkryzz2g+5kdXV1tC+aHJ5MBrDcJXBW9GkKuYpwAsK35R0yFfph/WyiOQcl0I85CgE0bIgor8oYQDLV+E8viWv9axDVSHVgHpw7xOk8+LF0PTTSdwAnLQ0dyLv4+S0dZ5rHlAzcUDtGjXGrQwi7HrH586siaTeHfPEYuOVXCAcXh5ZZhA/DEoAvDxz6rIbu0WgZmSZ0f7AbEAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T/gVGN1/WEoMXrNzfMNcfwmH/T7wbIdcmAYdWDLz5L0=; b=Y/JKyVw6A0acWWY6BJpcuJH5QBq8bSQUap/f7XV6sZTJh8gdjEFfjmF212mahEiLAYOUYmXQ0XvIsra0A1MTycvC1RbfhqZvyWun3kQ7SsKuBEaUyHuekU61mwMH4VEzKt1AV9l37pq/XP18hvwizABfi4fBr44Sq6lcsDHiBpxXxZlL4j1sm8kdi8+QUMe8SrZ4Zsidd12y76dzQ/X5wq2Vuq+XWodsUnVsVbSv09yCI0jQE/dIkLqYNAJBMAhIRtcjl+xDiwIL/yQAWYknu5oGwg+J4q1IgfoGAzo/M0TGnpWbeGCKAdRsGa9EBaE3TaGXdRlxuDy04+w3b6iHLA== Received: from BN6PR16CA0014.namprd16.prod.outlook.com (2603:10b6:404:f5::24) by BN9PR12MB5290.namprd12.prod.outlook.com (2603:10b6:408:103::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24; Mon, 10 May 2021 16:21:38 +0000 Received: from BN8NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:404:f5:cafe::2f) by BN6PR16CA0014.outlook.office365.com (2603:10b6:404:f5::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:21:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT043.mail.protection.outlook.com (10.13.177.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:38 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:21:25 +0000 From: Xueming Li To: Wenwu Ma CC: Luca Boccassi , Zhihong Peng , Qi Zhang , dpdk stable Date: Tue, 11 May 2021 00:02:13 +0800 Message-ID: <20210510160258.30982-184-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c600030-1098-4d3f-cb43-08d913cfb07e X-MS-TrafficTypeDiagnostic: BN9PR12MB5290: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pi0+Gsg17f+Cod4wXeYre7k/vaYovnMA3aSf9RJv5l5QE7L8c0jnk7V7Ur+0JH80NQ2GgQLKae0fNAnU7/4EBXcbjlovT8DIYmkrDmoRo+PRzZAY6BMZK4v/zzYgBCEwCEdxcPvdFMXHW+SylvHW7yqKAF4NZ3CeE8KXkCGkuXX6GOfCCuT52gmu/Ix+XEUAAZfdfuXzPBTZ7m/1/Rza9iBgsBtL+OYF+vHQ8urthxt1rYnfejT/qhVD+MKyFipNm+H/PhoQp3RT8PsjRpfa0EhJFKPrqXAkr8GI7YB4xgUGG0Wzkd/D6csKHCZCzJGsyKI8SGBbRtAlTe5n1L2QVzm/NC+5UKJ/1uvp8jRTJF+M9/aRA2tJvfnLZAfBIUZJrQqgg1Ant9RlxifYAwFVacKGpE6SaHpUZ1CSxrLX0cUC0c0WEyIkzJUA7F9yzR/IszitSybt3A4E0oQffe1Q2gfVTH4O3jpllVTOp8dXAYXbjMbHFM7pUNIrGpJn+PDH8F9NKFbaWu8zmykQ2MpxqUaxy6Sr0Y/W6rrI8t6CDPsHxEX5f9cvx0DvpKIdgFxbuOCX3SP7xnGLj69vRqwdgCRuHkK7g4LdQJuDMN4HcckSDdIxh40QtwHRiWMyNGaNX/9DE9XXSYpcdSNqU49ehdm/AbK1r47IkoEaRUS05EGxD3Xas6cXkVWHLFGtaWZwp1zSropGmEJ5vALrrcFYadSUZbNg6ADz/Ex1bMxeZNrO3YK+4WrQt08sc6hL/8ZiTTki2bjNFRCOa871cKpIUg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(376002)(396003)(346002)(39860400002)(46966006)(36840700001)(8676002)(7696005)(426003)(53546011)(36860700001)(47076005)(2616005)(966005)(8936002)(6666004)(4326008)(16526019)(336012)(70586007)(36906005)(86362001)(82310400003)(186003)(7636003)(6916009)(1076003)(54906003)(316002)(2906002)(478600001)(82740400003)(83380400001)(55016002)(36756003)(356005)(6286002)(5660300002)(70206006)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:21:38.7894 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5c600030-1098-4d3f-cb43-08d913cfb07e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5290 Subject: [dpdk-stable] patch 'net/ice: fix illegal access when removing MAC filter' has been queued to stable release 20.11.2 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" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/1cb30b35c9061267146bbfd72e2a61c91f12a8b6 Thanks. Xueming Li --- >From 1cb30b35c9061267146bbfd72e2a61c91f12a8b6 Mon Sep 17 00:00:00 2001 From: Wenwu Ma Date: Fri, 2 Apr 2021 13:52:47 +0000 Subject: [PATCH] net/ice: fix illegal access when removing MAC filter Cc: Luca Boccassi [ upstream commit f4b6eb2b91f38dc9ebc6c4e2b913fd1d25f14773 ] 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") Signed-off-by: Wenwu Ma Tested-by: Zhihong Peng Acked-by: Qi Zhang --- 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 b6d940c2ff..7c20936123 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" @@ -1088,12 +1090,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; @@ -1104,7 +1107,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_id); if (ret != ICE_SUCCESS) { ret = -EINVAL; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:31.338774100 +0800 +++ 0185-net-ice-fix-illegal-access-when-removing-MAC-filter.patch 2021-05-10 23:59:26.630000000 +0800 @@ -1 +1 @@ -From f4b6eb2b91f38dc9ebc6c4e2b913fd1d25f14773 Mon Sep 17 00:00:00 2001 +From 1cb30b35c9061267146bbfd72e2a61c91f12a8b6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit f4b6eb2b91f38dc9ebc6c4e2b913fd1d25f14773 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index a1365131e0..84d1735255 100644 +index b6d940c2ff..7c20936123 100644 @@ -33 +35 @@ -@@ -1092,12 +1094,13 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi) +@@ -1088,12 +1090,13 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi) @@ -48 +50 @@ -@@ -1108,7 +1111,7 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi) +@@ -1104,7 +1107,7 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi) @@ -54 +56 @@ - ret = ice_remove_vlan_filter(vsi, &v_f->vlan_info.vlan); + ret = ice_remove_vlan_filter(vsi, v_f->vlan_info.vlan_id);