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 83429A0093 for ; Tue, 10 May 2022 14:30:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7DFE34069D; Tue, 10 May 2022 14:30:30 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D73B14282F for ; Tue, 10 May 2022 14:30:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JedvCnUDEn06NIhRyvqo1SfGSKxUNDbTxgT8DXn65vA=; b=AQEOBz98T8Y8N/BlwhbQ994OjVP8BwnDYHLxSiYRCESGLUDFh/DzyGwgHOS8ACes2C1U7J ga5aE9k7OgVWkydKMjGIIWa+psrIQP7y6QQdtWXqjW6TiW7TUFil9H8akMd43gjJftTyKq T2v8aSv45a1jWa5zmZyyV1l/35ANVvc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-84-ZeAo-ZTNPh6VMpzK29sVcA-1; Tue, 10 May 2022 08:30:27 -0400 X-MC-Unique: ZeAo-ZTNPh6VMpzK29sVcA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1665B382ECD0 for ; Tue, 10 May 2022 12:30:27 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33FAC40CFD19; Tue, 10 May 2022 12:30:26 +0000 (UTC) From: Kevin Traynor To: Mike Pattrick Cc: David Marchand , dpdk stable Subject: patch 'net/i40e: populate error in flow director parser' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:43 +0100 Message-Id: <20220510123010.159523-6-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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/15/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/91355ad5b2cd9a61b63f6825884190a24c8e0b28 Thanks. Kevin --- >From 91355ad5b2cd9a61b63f6825884190a24c8e0b28 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 [ 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 e0cf996200..4f3808cb5f 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -3143,6 +3143,9 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, 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; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:21.752294900 +0100 +++ 0006-net-i40e-populate-error-in-flow-director-parser.patch 2022-05-10 13:24:21.558646301 +0100 @@ -1 +1 @@ -From 87063aaff3752470af21f3b80b257262d9d4a314 Mon Sep 17 00:00:00 2001 +From 91355ad5b2cd9a61b63f6825884190a24c8e0b28 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 87063aaff3752470af21f3b80b257262d9d4a314 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org