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 42858A0093 for ; Thu, 28 May 2020 18:25:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3A4C81D996; Thu, 28 May 2020 18:25:21 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 64DDF1DC20 for ; Thu, 28 May 2020 18:25:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683117; 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=bDeIRbeIkSeihwmhY5gotkVT83jBvqgZzj+iLTP0iu0=; b=Lae/ITWlyohmezTKxyc6G0+KdiNSDqUM17YWrRvAZ0MP5jiZQXf8UHB4/aSEX69ljwozjo tdXbbuyMBBH6R2b0B3+ec0YMPX+ws8EplaB0zfxVnr/snvpZYhw5V8VO/ZUzcFjf6lhouc 5kIiqpcMBEnA2eLR8H4jslI+rr3Te7A= 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-11-xXWpc5j3NVin4QFak08kPw-1; Thu, 28 May 2020 12:25:14 -0400 X-MC-Unique: xXWpc5j3NVin4QFak08kPw-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 E118B107ACF3; Thu, 28 May 2020 16:25:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id D378C60C87; Thu, 28 May 2020 16:25:11 +0000 (UTC) From: Kevin Traynor To: Lukasz Wojciechowski Cc: Anoob Joseph , Akhil Goyal , dpdk stable Date: Thu, 28 May 2020 17:22:29 +0100 Message-Id: <20200528162322.7863-42-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 session counter' 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/55e69e8b801281a3a6b568e5df12700c2bab3ade Thanks. Kevin. --- >From 55e69e8b801281a3a6b568e5df12700c2bab3ade Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Thu, 9 Apr 2020 19:24:52 +0200 Subject: [PATCH] security: fix session counter [ upstream commit e36b5a87d6d0e1e209d85dc22419924cbe02056c ] Fix session counter to be decreased in rte_security_session_destroy only when session was successfully destroyed. Formerly session counter was decreased prior session destroying and returning session object to mempool. It remained decreased even if session was not destroyed and mempool object released making counter invalid. Fixes: c261d1431bd8 ("security: introduce security API and framework") Signed-off-by: Lukasz Wojciechowski Acked-by: Anoob Joseph Acked-by: Akhil Goyal --- lib/librte_security/rte_security.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/librte_security/rte_security.c b/lib/librte_security/rte_security.c index 4f9639d693..56f30c88ba 100644 --- a/lib/librte_security/rte_security.c +++ b/lib/librte_security/rte_security.c @@ -91,12 +91,14 @@ rte_security_session_destroy(struct rte_security_ctx *instance, RTE_PTR_OR_ERR_RET(sess, -EINVAL); + ret = instance->ops->session_destroy(instance->device, sess); + if (ret != 0) + return ret; + + rte_mempool_put(rte_mempool_from_obj(sess), (void *)sess); + if (instance->sess_cnt) instance->sess_cnt--; - ret = instance->ops->session_destroy(instance->device, sess); - if (!ret) - rte_mempool_put(rte_mempool_from_obj(sess), (void *)sess); - - return ret; + return 0; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:01.314421212 +0100 +++ 0042-security-fix-session-counter.patch 2020-05-28 17:12:59.109556219 +0100 @@ -1 +1 @@ -From e36b5a87d6d0e1e209d85dc22419924cbe02056c Mon Sep 17 00:00:00 2001 +From 55e69e8b801281a3a6b568e5df12700c2bab3ade Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e36b5a87d6d0e1e209d85dc22419924cbe02056c ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 38ccc2ea9c..d475b09771 100644 +index 4f9639d693..56f30c88ba 100644