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 11A31A0093 for ; Thu, 28 May 2020 18:26:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0AA621DC1A; Thu, 28 May 2020 18:26:21 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id E97971D996 for ; Thu, 28 May 2020 18:26:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683179; 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=0DSH46A2Y44jHlPk5EtBKRjhgDhWc3E41ShH0zBTC4I=; b=FVB9jVxmgtDYGie+CF9MqcdmqwCDrAYJ39eho0DrBRu8+VQditntlbpP5IStCuf+WeACEO J/R5ZiRlanHg11YmyouOPBYMxlc/Y6nCveF2EdT1+1bW7Y2afmiVsnsoXXV4RfS4ui5OKS Dizdxa1msThydLqLdE8KMclhB31tH6w= 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-112-KXcbShn9OqidmGkW1ULKIg-1; Thu, 28 May 2020 12:26:16 -0400 X-MC-Unique: KXcbShn9OqidmGkW1ULKIg-1 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 DA6CAEC1A6; Thu, 28 May 2020 16:26:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03D0D60C05; Thu, 28 May 2020 16:26:14 +0000 (UTC) From: Kevin Traynor To: Konstantin Ananyev Cc: Akhil Goyal , dpdk stable Date: Thu, 28 May 2020 17:23:15 +0100 Message-Id: <20200528162322.7863-88-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'security: fix crash at accessing non-implemented ops' has been queued to LTS release 18.11.9 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.9 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/03/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/ce2659e1c2ea294658762f9322447989fe107a6f Thanks. Kevin. --- >From ce2659e1c2ea294658762f9322447989fe107a6f Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Thu, 23 Apr 2020 16:10:42 +0100 Subject: [PATCH] security: fix crash at accessing non-implemented ops [ upstream commit 34dff8bacc7b95cc288c24894443bd356e453b64 ] Valid checks for optional function pointers inside dev-ops were disabled by undefined macro. Fixes: b6ee98547847 ("security: fix verification of parameters") Signed-off-by: Konstantin Ananyev Acked-by: Akhil Goyal --- lib/librte_security/rte_security.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/librte_security/rte_security.c b/lib/librte_security/rte_security.c index 56f30c88ba..6ff7a9e69b 100644 --- a/lib/librte_security/rte_security.c +++ b/lib/librte_security/rte_security.c @@ -109,8 +109,9 @@ rte_security_set_pkt_metadata(struct rte_security_ctx *instance, { #ifdef RTE_DEBUG - RTE_PTR_CHAIN3_OR_ERR_RET(instance, ops, set_pkt_metadata, -EINVAL, - -ENOTSUP); RTE_PTR_OR_ERR_RET(sess, -EINVAL); + RTE_PTR_OR_ERR_RET(instance, -EINVAL); + RTE_PTR_OR_ERR_RET(instance->ops, -EINVAL); #endif + RTE_FUNC_PTR_OR_ERR_RET(*instance->ops->set_pkt_metadata, -ENOTSUP); return instance->ops->set_pkt_metadata(instance->device, sess, m, params); @@ -123,6 +124,8 @@ rte_security_get_userdata(struct rte_security_ctx *instance, uint64_t md) #ifdef RTE_DEBUG - RTE_PTR_CHAIN3_OR_ERR_RET(instance, ops, get_userdata, NULL, NULL); + RTE_PTR_OR_ERR_RET(instance, NULL); + RTE_PTR_OR_ERR_RET(instance->ops, NULL); #endif + RTE_FUNC_PTR_OR_ERR_RET(*instance->ops->get_userdata, NULL); if (instance->ops->get_userdata(instance->device, md, &userdata)) return NULL; -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.669500197 +0100 +++ 0088-security-fix-crash-at-accessing-non-implemented-ops.patch 2020-05-28 17:12:59.181554590 +0100 @@ -1 +1 @@ -From 34dff8bacc7b95cc288c24894443bd356e453b64 Mon Sep 17 00:00:00 2001 +From ce2659e1c2ea294658762f9322447989fe107a6f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 34dff8bacc7b95cc288c24894443bd356e453b64 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index d475b09771..dc9a3e89cd 100644 +index 56f30c88ba..6ff7a9e69b 100644