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 29818A04DD for ; Wed, 28 Oct 2020 11:54:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1BC36CA06; Wed, 28 Oct 2020 11:54:03 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id CE7F1C9C0 for ; Wed, 28 Oct 2020 11:54:00 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id g12so5136025wrp.10 for ; Wed, 28 Oct 2020 03:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2mdWu/AQHFSEQmptAgBwQ9mMFARlFC0NNUE1fdtP2FM=; b=Bdoc+OeucOGsKMgmts0yK16S8zRkVShHaP1OKbpwAELe34E0pDq5P0hiy1VHeOL7aZ TPZGyxPMnqdW/CQ79yZBawOntclwT7Vf0NkgZVWiUHGnv0NpjsssV9r3VuoqBrLAn7Iu 6AavbHkbw0/bw/ZKe/2syV/aES065NXrIbo4qsnUnqCbR8Ecn72qOebej+0wVe7oYp/I isBHjiVVBMWkqT/gfSUZ6+hJ2PuP+KjI/LIn8/ekfppQ2rno2bE7MZRZ2PD9n7y/QkHW DKiWpDBpNxDMuaBh5RVLjHcJfrJGY1UUmI9io0Gy2hQ736hYNzOzNLzuWDc5/5yCP8Ww PbFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2mdWu/AQHFSEQmptAgBwQ9mMFARlFC0NNUE1fdtP2FM=; b=gz+W29q21Ss31eOp0ut8AwHOxionidDmK2eo/kQM4Inck8tsyjnF8h8BlVLPyn0W7u 6e9wIgRJPg9kzjJvqbVWFIzKroxjTwZ8wYlErZrR0OoYks9Jt5/+/1xoJkQzGazyFkGB brPstfEL1zx4lUcncyAZbgvQ7tXDuasO6OxBW24qa4XMuGo/jfT0qy8ZfK6/UBcFVJo4 mnmkA5Tlz7uQk4Zr+DcXIVWbDl39luHRulpBxSahoVqy8pzUtDUsC7vtgvoMwc/WRHBM OxXWx0uqe3dd7N2W4aA7d9AsjPHcVUS6UnAQh1/AHujBSOrGG++AjDCCLpBWm9r9dLoC 8bUw== X-Gm-Message-State: AOAM532rk2fKEVKkyCXNKRHjYO4gMvln3Jf7KPidsltV4c4K9Cp9PAv0 yxbjBNrs4clRI41ZvsOoZ3Y= X-Google-Smtp-Source: ABdhPJwADSmsO15d+YCTahiWNIExwbFuAuTbuZRi9UCI/VyQs4IcJ2dpBT7TbEFswL4pyPGVzMbGUw== X-Received: by 2002:adf:e8cf:: with SMTP id k15mr8092285wrn.262.1603882440546; Wed, 28 Oct 2020 03:54:00 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r1sm6524742wro.18.2020.10.28.03.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:53:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: Akhil Goyal , dpdk stable Date: Wed, 28 Oct 2020 10:45:07 +0000 Message-Id: <20201028104606.3504127-148-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/armv8: fix mempool object returning' has been queued to stable release 19.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 stable release 19.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 10/30/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. Thanks. Luca Boccassi --- >From 8c04c7829c6fe7e8acdc2b4ff9a7db7b89fa8f0a Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Mon, 31 Aug 2020 16:51:44 +0800 Subject: [PATCH] crypto/armv8: fix mempool object returning [ upstream commit 76a4ed5b3bc91c5296e3d6780243d237f3ed8506 ] Crypto session and device session private data were put back to wrong pools. This caused data corruption when the object was reallocated and used. Because objects from different mempools have different element size, and wrong mempool info caused out of bound write. Fix the issue by putting back objects to correct mempools. Fixes: b3bbd9e5f265 ("cryptodev: support device independent sessions") Fixes: 725d2a7fbf71 ("cryptodev: change queue pair configure structure") Signed-off-by: Ruifeng Wang Acked-by: Akhil Goyal --- drivers/crypto/armv8/rte_armv8_pmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c index bc897ac713..3c5af17e68 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c @@ -666,8 +666,8 @@ process_op(struct armv8_crypto_qp *qp, struct rte_crypto_op *op, memset(op->sym->session, 0, rte_cryptodev_sym_get_existing_header_session_size( op->sym->session)); - rte_mempool_put(qp->sess_mp, sess); - rte_mempool_put(qp->sess_mp_priv, op->sym->session); + rte_mempool_put(qp->sess_mp_priv, sess); + rte_mempool_put(qp->sess_mp, op->sym->session); op->sym->session = NULL; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:16.339063633 +0000 +++ 0148-crypto-armv8-fix-mempool-object-returning.patch 2020-10-28 10:35:11.740833497 +0000 @@ -1,8 +1,10 @@ -From 76a4ed5b3bc91c5296e3d6780243d237f3ed8506 Mon Sep 17 00:00:00 2001 +From 8c04c7829c6fe7e8acdc2b4ff9a7db7b89fa8f0a Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Mon, 31 Aug 2020 16:51:44 +0800 Subject: [PATCH] crypto/armv8: fix mempool object returning +[ upstream commit 76a4ed5b3bc91c5296e3d6780243d237f3ed8506 ] + Crypto session and device session private data were put back to wrong pools. This caused data corruption when the object was reallocated and used. @@ -12,7 +14,6 @@ Fixes: b3bbd9e5f265 ("cryptodev: support device independent sessions") Fixes: 725d2a7fbf71 ("cryptodev: change queue pair configure structure") -Cc: stable@dpdk.org Signed-off-by: Ruifeng Wang Acked-by: Akhil Goyal @@ -21,10 +22,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c -index c95729db50..72d29ae0cb 100644 +index bc897ac713..3c5af17e68 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c -@@ -674,8 +674,8 @@ process_op(struct armv8_crypto_qp *qp, struct rte_crypto_op *op, +@@ -666,8 +666,8 @@ process_op(struct armv8_crypto_qp *qp, struct rte_crypto_op *op, memset(op->sym->session, 0, rte_cryptodev_sym_get_existing_header_session_size( op->sym->session));