From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 45254A04F5 for ; Wed, 11 Dec 2019 22:28:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3D7282C6A; Wed, 11 Dec 2019 22:28:03 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 883241BE84 for ; Wed, 11 Dec 2019 22:28:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099681; 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=9jOypV3Rg0nT5MYgu1/Xj5nJFVNnrz3r23h4LgzCXsM=; b=c8a5xUOJoAu1LEo3Hi6Woz+E2a6t+4hcxTxJpWtmZ5SePfzDP0ZPnQrhGYoFc8BpQPT9tc zZZD/2KTuFTshPTzpWM0gWaBR6xkU/RgoreYT+9eOeSXZKGM4MnHAmzZitkM1DjbX134SA CVM7hakPDfnZR+G0FZGMjQopvIcRll0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-68-OGFHFgR0Ozu_u1Xn0mWZeQ-1; Wed, 11 Dec 2019 16:27:57 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B8D451005502; Wed, 11 Dec 2019 21:27:56 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEF8310016DA; Wed, 11 Dec 2019 21:27:55 +0000 (UTC) From: Kevin Traynor To: Matan Azrad Cc: Ori Kam , dpdk stable Date: Wed, 11 Dec 2019 21:26:07 +0000 Message-Id: <20191211212702.27851-15-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: OGFHFgR0Ozu_u1Xn0mWZeQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'ethdev: fix item expansion for RSS flow' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.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 12/17/19. 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 rebasi= ng (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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/a9228f7067852d691a= 4425d3237cab77af5d34fa Thanks. Kevin. --- >From a9228f7067852d691a4425d3237cab77af5d34fa Mon Sep 17 00:00:00 2001 From: Matan Azrad Date: Tue, 26 Nov 2019 09:04:10 +0000 Subject: [PATCH] ethdev: fix item expansion for RSS flow [ upstream commit 64edb05e29c82260a0bd1000a20023d20c123e41 ] When the last item in flow pattern includes "next protocol" field which is relevant for RSS flow expansion, a new item is added to the pattern according to the "next protocol" field. This field is called missed field. The missed field wrongly was not initialized what caused to some of the flow item fields to contain garbage values. As a result, the PMDs internal flow engine may crash. For example, the spec value may include garbage pointer and to cause crash. Initialize the missed field with zeroes. Fixes: fc2dd8dd492f ("ethdev: fix expand RSS flows") Signed-off-by: Matan Azrad Acked-by: Ori Kam --- lib/librte_ethdev/rte_flow.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index d545b15f5..5725aceda 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -984,4 +984,5 @@ rte_flow_expand_rss(struct rte_flow_expand_rss *buf, si= ze_t size, =09const struct rte_flow_item *last_item =3D NULL; =20 +=09memset(&missed_item, 0, sizeof(missed_item)); =09lsize =3D offsetof(struct rte_flow_expand_rss, entry) + =09=09elt_n * sizeof(buf->entry[0]); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:13.971759304 +0000 +++ 0015-ethdev-fix-item-expansion-for-RSS-flow.patch=092019-12-11 21:24:12= .598652643 +0000 @@ -1 +1 @@ -From 64edb05e29c82260a0bd1000a20023d20c123e41 Mon Sep 17 00:00:00 2001 +From a9228f7067852d691a4425d3237cab77af5d34fa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 64edb05e29c82260a0bd1000a20023d20c123e41 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index d7f29e532..87a3e8c4c 100644 +index d545b15f5..5725aceda 100644 @@ -34 +35 @@ -@@ -1072,4 +1072,5 @@ rte_flow_expand_rss(struct rte_flow_expand_rss *buf,= size_t size, +@@ -984,4 +984,5 @@ rte_flow_expand_rss(struct rte_flow_expand_rss *buf, s= ize_t size,