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 7314CA0C47 for ; Mon, 26 Jul 2021 15:54:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 64C4D410EE; Mon, 26 Jul 2021 15:54:26 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id C2B7640F35 for ; Mon, 26 Jul 2021 15:54:24 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id k14-20020a05600c1c8eb02901f13dd1672aso53652wms.0 for ; Mon, 26 Jul 2021 06:54:24 -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=Jsd/cEzvAtlPlTzDZ34WOTsGhwjo3dWh8w043fuLfD0=; b=S+4Db6RYL8sbf6cIjq+TlbfJKqfsY1prLt5cSl7iGoXGcfoTZuZWITRuWbpOfVtn6e REInV78278LoreOO9qic6QIG+ss65xU25W5k/+K7DDs25bRBRaTfST0PVS8fa3LrPn2Y ME0OAhfe8A2LL3gvLE4F4MD5/0etmrF0HV/IfynUYq+Exoq5w31OSkTyWeZCi3xxF0NK wnh4cl+xaw9LLaDWs5dTws1epMZJtnxN7OFJju5qjEh0JNVTDRRjv0WypE41PP5H4l7i 6e1iKWyTAw8A/yfcdKnRqWe/z0cGXlu7Sw2EonaRouFvpH6+zdg22nXB2ocrgKmfoBC/ leMQ== 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=Jsd/cEzvAtlPlTzDZ34WOTsGhwjo3dWh8w043fuLfD0=; b=ei5qPzuDSsPdnD/9SzTInc3Nxt8i+fTLwD71Kqr8tago6d6Wv4c6EXSWFyO+1FJDoU bcCzq8SFNxoGKbQfWi4+XuscRZrW8Os2mwsqXpowJY5OjeHBRuGECmsTEfk8ui84CVWq XdZ0fsnW9xs3hjFxM6fmGQj1UmV3GHqaGPwoygIKnHrlqiCdBnfCqAEnFCdwJxCOKZO7 Q7TvcyISWmNn/UmZWWNU9f+vRPkfNdEFPgoW2azMnBjhuTM8MhocPT9h3VVhqgJqz6HN wSw89mSJPUqOmP2KgO5bF1vXXAAwzLd9LOBFuwPe+nyaV0ZFqRF7Iqx4AoQXAwzaS3WS aAfw== X-Gm-Message-State: AOAM530u76QfXJBb8Tlvt2X82HVVPm4F1uevAdlIlctE6wp0NB/0Kh5R ArRA3Old0fxWynJujghW8VY= X-Google-Smtp-Source: ABdhPJwot8rdgPxtGHSSoQU8sqi1W0H6U5ysuGpzPiligFhC/Tla9LMNK/bQPqynFOFVXBj63dLj2g== X-Received: by 2002:a05:600c:322a:: with SMTP id r42mr11070976wmp.153.1627307664610; Mon, 26 Jul 2021 06:54:24 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id r17sm13336127wmq.13.2021.07.26.06.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:54:24 -0700 (PDT) From: luca.boccassi@gmail.com To: Anoob Joseph Cc: Akhil Goyal , dpdk stable Date: Mon, 26 Jul 2021 14:52:42 +0100 Message-Id: <20210726135322.149850-19-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/octeontx2: fix IPsec session member overlap' has been queued to stable release 20.11.3 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/48181d181df0629486f3b7428286fb5b21041d07 Thanks. Luca Boccassi --- >From 48181d181df0629486f3b7428286fb5b21041d07 Mon Sep 17 00:00:00 2001 From: Anoob Joseph Date: Tue, 13 Jul 2021 15:57:06 +0530 Subject: [PATCH] crypto/octeontx2: fix IPsec session member overlap [ upstream commit 40beec4bf4e37327437dbcf0e9991a48ed369848 ] The member 'dir' should not overlap with 'ip'. Usage of union for all members would mean dir would get corrupt. Fixes: e91b4f45ff54 ("net/octeontx2: support anti-replay for security session") Signed-off-by: Anoob Joseph Acked-by: Akhil Goyal --- drivers/crypto/octeontx2/otx2_security.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/octeontx2/otx2_security.h b/drivers/crypto/octeontx2/otx2_security.h index 33d3b15155..7087ea33c7 100644 --- a/drivers/crypto/octeontx2/otx2_security.h +++ b/drivers/crypto/octeontx2/otx2_security.h @@ -19,14 +19,16 @@ #define OTX2_SEC_AES_GCM_ROUNDUP_BYTE_LEN 4 #define OTX2_SEC_AES_CBC_ROUNDUP_BYTE_LEN 16 -union otx2_sec_session_ipsec { - struct otx2_sec_session_ipsec_ip ip; - struct otx2_sec_session_ipsec_lp lp; +struct otx2_sec_session_ipsec { + union { + struct otx2_sec_session_ipsec_ip ip; + struct otx2_sec_session_ipsec_lp lp; + }; enum rte_security_ipsec_sa_direction dir; }; struct otx2_sec_session { - union otx2_sec_session_ipsec ipsec; + struct otx2_sec_session_ipsec ipsec; void *userdata; /**< Userdata registered by the application */ } __rte_cache_aligned; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:16.865873368 +0100 +++ 0019-crypto-octeontx2-fix-IPsec-session-member-overlap.patch 2021-07-26 13:53:15.833292286 +0100 @@ -1 +1 @@ -From 40beec4bf4e37327437dbcf0e9991a48ed369848 Mon Sep 17 00:00:00 2001 +From 48181d181df0629486f3b7428286fb5b21041d07 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 40beec4bf4e37327437dbcf0e9991a48ed369848 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 9f1ba71b46..29c8fc351b 100644 +index 33d3b15155..7087ea33c7 100644 @@ -22 +23 @@ -@@ -20,14 +20,16 @@ +@@ -19,14 +19,16 @@