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 BA365A0543 for ; Tue, 21 Jun 2022 10:03:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B221540151; Tue, 21 Jun 2022 10:03:50 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2042.outbound.protection.outlook.com [40.107.243.42]) by mails.dpdk.org (Postfix) with ESMTP id 65CB3427EE for ; Tue, 21 Jun 2022 10:03:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LkbnadU8P3nhsxFAiYQQmpp6CRevwB2m1v1pJqFQeeJCByqYeP7CsYWrj3TkpVGPJiTPAhkOe0rIoZ0I53VMiWVaXRjmq5eDzDcqGIR3ZEEQUrzmNmKKEGfGgZHJbu4MwCAmsAry3F0HLYfgzK5MIUFBICuwgcTog7LWa/XTjguWjoAnjij1XiFqgq7oh7qF5KTGi+FlZr7A7xVFHlEKse4g+isvJttSN/3cAKC24Aj3Sextl9wnONk8vd+i2aMSYsQo2BndHLKJTODnTuvnLIl85EZuWPjemAXspUL7DRVwBSdI6anhekJ/yozXrEGjHkMc+TVVcBsNXmSZs1u5+w== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WxQqkg9D6vWWkpE1ZG9smdt+Bf7wT5zv4LKPK6yy54E=; b=oRQOtGhzAhozrVxZmyxTOpLyba5l6Hg2pLMz1AeYxbQHXfjJIrsp6mdAdFlj7ReEfgNtLiJrjNnVNKSZKwaay1hvBQEtv3IHIODkaqfRRbPNHThsRa92pYaQKPfk+c6i2kOgz/i1ihC4omCHyaG0bA95NgbQQGg+H84LJPQAt55aS94fiGOABarHKG5TwjED9F/9nLocNpthJD1OfrzIDUWXaAmc6yC61pI9nVqggZFrmpfE8MCVqquPw8HJr5p9OQLcoAQLDW1hEqum3suPvkD/2Bl4+mL2k9nha2f2fC451xOANoc5pi/F+/sXwxNqWj2hr3gr/JUSfA8SP1/M8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=WxQqkg9D6vWWkpE1ZG9smdt+Bf7wT5zv4LKPK6yy54E=; b=LUMZsDMWAZ51z/kJ4krQ/rSWCpeBWeDAxjR3xtvTwViU0GdVMtzE8pD0xKgHlAG/DuW74iM4bU01ndkOU9XwYlryHJ1u1MmABXR+Yx6BeFxONM/vyDUeSzaYEFnExhvlFwL8mZ6PnKC5YIA2ajwkGr0NGDo+ZBt6wPtJ05ZgouL1c3sY49mRftnHnW9umf09kHjNt7CkDn9IRUEPCwjgK9OUeyfmzTci+yCBEaIoAC+DAdNY8iLJq5Z5ZarhoLjlSRGJpLWhSqP2CvweUTI5FeZRKFQ35kZ8Mvmd+fQriDSOMNPjzsGQlmS68UENgMgsSjwiV80E+q9dqE8+CwBFKQ== Received: from DS7PR05CA0101.namprd05.prod.outlook.com (2603:10b6:8:56::21) by SJ1PR12MB6337.namprd12.prod.outlook.com (2603:10b6:a03:456::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Tue, 21 Jun 2022 08:03:47 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:8:56:cafe::10) by DS7PR05CA0101.outlook.office365.com (2603:10b6:8:56::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.9 via Frontend Transport; Tue, 21 Jun 2022 08:03:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.236) by DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:03:47 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:03:46 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:03:45 -0700 From: Xueming Li To: Mike Pattrick CC: David Marchand , dpdk stable Subject: patch 'net/i40e: populate error in flow director parser' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:13 +0300 Message-ID: <20220621080301.2315720-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8359eab8-7182-4402-a53e-08da535c91c7 X-MS-TrafficTypeDiagnostic: SJ1PR12MB6337:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D2NH+S76pj2+1noGaxXDiESjg8+1VGLapnRC3VfoygBh4ZlIvl1Yimk1Mi5gakjudKCCQXSMiCU1hZTKmdZPeux8/OsQpZxpQoKfG6NSLtJk/l0KVnzDSwaCzCliQcxBIqApxuN6sJC+MU0lLwtLMQuFBIZEj8yFzuSbnttqeLCDL/1wJ4lbzCXHpZxlGHtehm026ho9qiRQMLLNeBQua3nrbtqBP5tvKPNQAulnt3cUU5BU695Q/85P4MLQRk7wxlA7OsJt7kLve1X0XFCCiLBzPpKHDkwJPKMOOVQa7EmFv0/oK2X1WA8GjQvh9Jpdbi12qVHQ1z21TMrUosQsV1mXCjHja8+sjMGDs7xeoct6WUq09kQ6YOztmUwug0tS1poUbS4i3lfvm8WWbEggz1t+Yg4gM1u9LbERnHxIs2CEo1nXJ7f9MYzM7Pm1T3+1mdbvtRoKJ9PdjV7nrc8mi7uTH4YzSxcIqT5R0PPgizN99y6t3vFMz88PxDQyjgzNs4qRopg9xbwmJPY5nbqNTIMgGmTQDWLPnweW72tyZe+6KoU+QvBrCheDK9tbWNEQkgj1rBKkkWyYM8MdZe0CDeWkHQsUKkVqAMZCfyyKssWUOyNApFsGN0vfic2oCp+Ix3xu+1lzQf4k18R/m/pVVBKnoCS3x05BO30y84yiLH1tMy1nYdNxTji3gVBdeycXZBwbn2cwISADRx4h6t9QvXzDiXy02diMh1H99ISUgbrdFvBf639Qo6jP3HfrT7kQQbxw39xv9Gy7E7OLwHiIIVqVUFLFsmAdHsu9eqxFRiXKdqKF8yuO13/WCBmnxzF0TU9Kdt6bO2vmF3rB6UwsOoFhr+1v9FOCPocxAuf3qPA= X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(376002)(346002)(396003)(136003)(39860400002)(36840700001)(40470700004)(46966006)(86362001)(478600001)(54906003)(6666004)(82740400003)(70586007)(81166007)(356005)(316002)(83380400001)(8676002)(336012)(36860700001)(8936002)(1076003)(41300700001)(426003)(4326008)(70206006)(186003)(55016003)(16526019)(7696005)(36756003)(40460700003)(53546011)(2616005)(82310400005)(40480700001)(6916009)(2906002)(47076005)(5660300002)(6286002)(966005)(26005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:03:47.2817 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8359eab8-7182-4402-a53e-08da535c91c7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6337 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 Hi, FYI, your patch has been queued to stable release 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/22. 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/4d6996d25a365a8ae49a1a66a06220b9acd58915 Thanks. Xueming Li --- >From 4d6996d25a365a8ae49a1a66a06220b9acd58915 Mon Sep 17 00:00:00 2001 From: Mike Pattrick Date: Mon, 21 Mar 2022 23:19:37 -0400 Subject: [PATCH] net/i40e: populate error in flow director parser Cc: Xueming Li [ upstream commit 87063aaff3752470af21f3b80b257262d9d4a314 ] Errors from i40e_flow_parse_fdir_pattern() can bubble up to rte_flow_create. If rte_flow_error is not initialized a caller may dereference error->message. This may be uninitialized memory, leading to a segemntation fault. Fixes: 4a072ad43442 ("net/i40e: fix flow director config after flow validate") Signed-off-by: Mike Pattrick Reviewed-by: David Marchand --- drivers/net/i40e/i40e_flow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 599b5f123d..b41a1fd3ca 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -3142,8 +3142,11 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, /* Check if the input set is valid */ if (i40e_validate_input_set(pctype, RTE_ETH_FILTER_FDIR, input_set) != 0) { - PMD_DRV_LOG(ERR, "Invalid input set"); - return -EINVAL; + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "Invalid input set"); + return -rte_errno; } filter->input.flow_ext.input_set = input_set; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:49.613329797 +0800 +++ 0007-net-i40e-populate-error-in-flow-director-parser.patch 2022-06-21 15:37:48.961117647 +0800 @@ -1 +1 @@ -From 87063aaff3752470af21f3b80b257262d9d4a314 Mon Sep 17 00:00:00 2001 +From 4d6996d25a365a8ae49a1a66a06220b9acd58915 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 87063aaff3752470af21f3b80b257262d9d4a314 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index e0cf996200..4f3808cb5f 100644 +index 599b5f123d..b41a1fd3ca 100644