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 F0A9DA04C3 for ; Fri, 22 Nov 2019 15:42:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E86A51B103; Fri, 22 Nov 2019 15:42:43 +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 E098F374 for ; Fri, 22 Nov 2019 15:42:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433761; 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=MGiTlYY+56U8bENSekDeGjTcgWE7nUbe58xA9ELq9Wo=; b=GzRQJxvBRVnHPgOGR0OPeNnB+LrIC+MWbJNRg1iO65+uLx2eA9e69DK5IqwgaoOC1iyX2A IZX1KDupmo93EFMTP46PNnXK6gfFakc8r42/ixOohNjpHGCOfk9FwIY9F3GRUGgPznO0J/ 5LCGyfpxLg/s7NbvaZqB1l/s131SN2Q= 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-170-L_v_T0ngPtWTZvjOnuqtgA-1; Fri, 22 Nov 2019 09:42:38 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 459EE184CAA1; Fri, 22 Nov 2019 14:42:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 357656E713; Fri, 22 Nov 2019 14:42:36 +0000 (UTC) From: Kevin Traynor To: Bernard Iremonger Cc: Akhil Goyal , dpdk stable Date: Fri, 22 Nov 2019 14:41:13 +0000 Message-Id: <20191122144131.21231-27-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: L_v_T0ngPtWTZvjOnuqtgA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'examples/ipsec-secgw: fix unchecked return value' 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 11/29/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/03f8a9270eb03b0706= a4cc151a847064f5678533 Thanks. Kevin. --- >From 03f8a9270eb03b0706a4cc151a847064f5678533 Mon Sep 17 00:00:00 2001 From: Bernard Iremonger Date: Wed, 7 Aug 2019 13:30:12 +0100 Subject: [PATCH] examples/ipsec-secgw: fix unchecked return value [ upstream commit 23742f21f74a9d8380367c39b8ee4561e6dd1526 ] Check the return value of the rte_eth_dev_rss_hash_conf_get function. Coverity issue: 344970 Fixes: 3a690d5a65e2 ("examples/ipsec-secgw: fix first packet with inline cr= ypto") Signed-off-by: Bernard Iremonger Acked-by: Akhil Goyal --- examples/ipsec-secgw/ipsec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c index 872a8b819..0f94a76a9 100644 --- a/examples/ipsec-secgw/ipsec.c +++ b/examples/ipsec-secgw/ipsec.c @@ -201,6 +201,12 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ips= ec_sa *sa) =09=09=09=09sa->action[1].type =3D RTE_FLOW_ACTION_TYPE_RSS; =09=09=09=09sa->action[1].conf =3D &action_rss; -=09=09=09=09rte_eth_dev_rss_hash_conf_get(sa->portid, +=09=09=09=09ret =3D rte_eth_dev_rss_hash_conf_get(sa->portid, =09=09=09=09=09=09=09 &rss_conf); +=09=09=09=09if (ret !=3D 0) { +=09=09=09=09=09RTE_LOG(ERR, IPSEC, +=09=09=09=09=09=09"rte_eth_dev_rss_hash_conf_get:ret=3D%d\n", +=09=09=09=09=09=09ret); +=09=09=09=09=09return -1; +=09=09=09=09} =09=09=09=09for (i =3D 0, j =3D 0; =09=09=09=09 i < dev_info.nb_rx_queues; ++i) --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:56.667222285 +0000 +++ 0027-examples-ipsec-secgw-fix-unchecked-return-value.patch=092019-11-22= 14:36:55.195149329 +0000 @@ -1 +1 @@ -From 23742f21f74a9d8380367c39b8ee4561e6dd1526 Mon Sep 17 00:00:00 2001 +From 03f8a9270eb03b0706a4cc151a847064f5678533 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 23742f21f74a9d8380367c39b8ee4561e6dd1526 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - examples/ipsec-secgw/ipsec.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) + examples/ipsec-secgw/ipsec.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) @@ -19 +20 @@ -index dc85adfe5..5f9d560dd 100644 +index 872a8b819..0f94a76a9 100644 @@ -22,14 +23,14 @@ -@@ -249,5 +249,12 @@ create_inline_session(struct socket_ctx *skt_ctx, str= uct ipsec_sa *sa) - =09=09=09sa->action[1].type =3D RTE_FLOW_ACTION_TYPE_RSS; - =09=09=09sa->action[1].conf =3D &action_rss; --=09=09=09rte_eth_dev_rss_hash_conf_get(sa->portid, &rss_conf); -+=09=09=09ret =3D rte_eth_dev_rss_hash_conf_get(sa->portid, -+=09=09=09=09=09&rss_conf); -+=09=09=09if (ret !=3D 0) { -+=09=09=09=09RTE_LOG(ERR, IPSEC, -+=09=09=09=09=09"rte_eth_dev_rss_hash_conf_get:ret=3D%d\n", -+=09=09=09=09=09ret); -+=09=09=09=09return -1; -+=09=09=09} - =09=09=09for (i =3D 0, j =3D 0; i < dev_info.nb_rx_queues; ++i) - =09=09=09=09queue[j++] =3D i; +@@ -201,6 +201,12 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ip= sec_sa *sa) + =09=09=09=09sa->action[1].type =3D RTE_FLOW_ACTION_TYPE_RSS; + =09=09=09=09sa->action[1].conf =3D &action_rss; +-=09=09=09=09rte_eth_dev_rss_hash_conf_get(sa->portid, ++=09=09=09=09ret =3D rte_eth_dev_rss_hash_conf_get(sa->portid, + =09=09=09=09=09=09=09 &rss_conf); ++=09=09=09=09if (ret !=3D 0) { ++=09=09=09=09=09RTE_LOG(ERR, IPSEC, ++=09=09=09=09=09=09"rte_eth_dev_rss_hash_conf_get:ret=3D%d\n", ++=09=09=09=09=09=09ret); ++=09=09=09=09=09return -1; ++=09=09=09=09} + =09=09=09=09for (i =3D 0, j =3D 0; + =09=09=09=09 i < dev_info.nb_rx_queues; ++i)