From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 49874A0C47 for ; Tue, 10 Aug 2021 17:42:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 42F3740686; Tue, 10 Aug 2021 17:42:42 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 1CE3440686 for ; Tue, 10 Aug 2021 17:42:41 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 00F8F3F357 for ; Tue, 10 Aug 2021 15:42:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610161; bh=hnspYT+FcmkciZG+0eJXdEEJNlgcjGX3YOchWuw+OOw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HkzoqEqZub1/AhoYbw50p+YDzO7SP2R4h9o0tQGPGPEgJbU3Z1NcjR3/Qbejqlbuo 5abl5xA8kaKxjXEvCxHTaufrBpHHMDpgyjQAsHI+pDgFyiIx3zEKJGuVO83Mhbu0HC MYKV862ODNlzy4Rl2xYgu5/MqPz+ZJufegGip6yWE43hUqfhgBmBeUa0gW/i9Gqk8i L+r7RhFotomfyOv43BbmwjQP+/WxQYhm87sSopULETuzEQj0DEtAsFv/K1qbjK7PaV 39PKp0tFK4WDHvvwFrqOrvy0q2prIKK3eUug+4pAZAeW+1oPjTFJQnCJLBdltJJ9Zg ++qdsnJFoivAw== Received: by mail-ed1-f70.google.com with SMTP id de5-20020a0564023085b02903bb92fd182eso11038796edb.8 for ; Tue, 10 Aug 2021 08:42:40 -0700 (PDT) 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=hnspYT+FcmkciZG+0eJXdEEJNlgcjGX3YOchWuw+OOw=; b=MBkjkkotS7Dy3SrK3Lg1oIfQ628k+OxGjsm0+c6jAy+aR2HM3SdtfjwxnEEu9aQuwF khOM+/T4ikngvqj0pscPgj4q9nqxGdhumoGQg/1e3vu/Adaw+60/MZb1jNW6NOmaSwv7 3OvP00NdJx3jKtyLr93vdFtx3jE1Ebx/D3+Hg1sc57shVIXtSHLxjKoaCYkCRqhi5C4b d5U90ulNZYACWJ+2qcBmNg1nJ/BJn+CfQOJNAI43RVEeuI9chOI44ksnMAW8If4/UTnS VZlw7b52cKnYslgcVYVtm8o7vc3FZzQTDhizRmUCffcjZXvd0f9A5BPiLf+g9v+RGkPl XWag== X-Gm-Message-State: AOAM530W5bxdu464145eD3dEKJwoTPJbwBbwjh2y+7ujMzm0xQTkGWfQ BwW7Q1kk4XpTPbv8wKdaEy1f9YsixYMAN5P/smSFzYrCoZLJOoPY+erO+iXho9AgT+LvPAY7VCi gT1ZiEUNRUjauXypVOCHnnBpN X-Received: by 2002:a17:906:a24c:: with SMTP id bi12mr28507663ejb.530.1628610160387; Tue, 10 Aug 2021 08:42:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4Fs+HAG2HOML2LXHAeYRwKQbT2o9PLOBu+roIjHFpOjqgGuIGGCptOrgx7/hhLY861OsqIw== X-Received: by 2002:a17:906:a24c:: with SMTP id bi12mr28507648ejb.530.1628610160195; Tue, 10 Aug 2021 08:42:40 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id ck3sm9729443edb.80.2021.08.10.08.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:42:39 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Dana Vardi Cc: Michael Shamis , Liron Himi , dpdk stable Date: Tue, 10 Aug 2021 17:39:23 +0200 Message-Id: <20210810154022.749358-43-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/mvsam: fix session data reset' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/ed613ddf67e692bf43cb0d5cfd4a58a46ff9b439 Thanks. Christian Ehrhardt --- >From ed613ddf67e692bf43cb0d5cfd4a58a46ff9b439 Mon Sep 17 00:00:00 2001 From: Dana Vardi Date: Thu, 1 Jul 2021 09:59:20 +0300 Subject: [PATCH] crypto/mvsam: fix session data reset [ upstream commit 03e73e8572f112bd3714cd90c491a6570330189c ] This patch fix wrong clear memory session pointer. When call mrvl_crypto_pmd_sym_session_clear function, it might cause the following error: CRYPTODEV: set_sym_session_private_data() line 497: Set private data for driver 1 not allowed This fix set zeroes to mrvl_crypto_session pointer instead to rte_cryptodev_sym_session pointer, and will verify that rte_cryptodev_sym_session pointer will not lose data such as nb_drivers. Bugzilla ID: 646 Fixes: 8a61c83af2fa ("crypto/mrvl: add mrvl crypto driver") Signed-off-by: Dana Vardi Reviewed-by: Michael Shamis Reviewed-by: Liron Himi --- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c index bf9c1200ef..f92a97bd31 100644 --- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c @@ -804,7 +804,7 @@ mrvl_crypto_pmd_sym_session_clear(struct rte_cryptodev *dev, MRVL_LOG(ERR, "Error while destroying session!"); } - memset(sess, 0, sizeof(struct mrvl_crypto_session)); + memset(mrvl_sess, 0, sizeof(struct mrvl_crypto_session)); struct rte_mempool *sess_mp = rte_mempool_from_obj(sess_priv); set_sym_session_private_data(sess, index, NULL); rte_mempool_put(sess_mp, sess_priv); -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:14.711775103 +0200 +++ 0043-crypto-mvsam-fix-session-data-reset.patch 2021-08-10 15:11:13.006638012 +0200 @@ -1 +1 @@ -From 03e73e8572f112bd3714cd90c491a6570330189c Mon Sep 17 00:00:00 2001 +From ed613ddf67e692bf43cb0d5cfd4a58a46ff9b439 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 03e73e8572f112bd3714cd90c491a6570330189c ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 527ddef0cf..4eb7ec97d1 100644 +index bf9c1200ef..f92a97bd31 100644 @@ -33 +34 @@ -@@ -793,7 +793,7 @@ mrvl_crypto_pmd_sym_session_clear(struct rte_cryptodev *dev, +@@ -804,7 +804,7 @@ mrvl_crypto_pmd_sym_session_clear(struct rte_cryptodev *dev,