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 7C24CA0C41 for ; Tue, 30 Nov 2021 17:43:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 77DC9411B8; Tue, 30 Nov 2021 17:43:31 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id CBE7141190 for ; Tue, 30 Nov 2021 17:43:30 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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-internal-0.canonical.com (Postfix) with ESMTPS id A80973F1B1 for ; Tue, 30 Nov 2021 16:43:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290610; bh=SzIl2CwC1rbhLeb34TIrpTHiR+VdmY3TqV+5mR9VsgA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sOOOEAoT6j2u/g7HTn/DtRhG/AmdwbvxvlLQauZLS9SAQJfGNCrRe9UO/rcBcCQGe r4ru4d7TueVYRdeLl9gdyQYrRUosdlL/Uyw1i/bhIPgBbGrJ9tNp9Mb1lPwUEf91sx Kyi1Bb/WuEPg9fPm82vPdNQoacBdjy92Z6yQtRhqJhR6u0pBO7+cbcPpgiNdi7PH8c fXw0aL1K2XsU73zrvdT3qtIfOwhNIWEcbaHw+7EM8L8fULlwz2GH2v7yKEXzYIAAio 9mxyE2Ntwp1XSdceKZZH1oMQgpA9cll84hUM3NbxutFAehk8pSybCieUW11HRzUB/H YqB3VZ/AsFJPQ== Received: by mail-ed1-f71.google.com with SMTP id i19-20020a05640242d300b003e7d13ebeedso17456815edc.7 for ; Tue, 30 Nov 2021 08:43:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SzIl2CwC1rbhLeb34TIrpTHiR+VdmY3TqV+5mR9VsgA=; b=UA/WVQPBx2EOiELDDOfXRAKwz1aKqCeD7CRTdIYa/8x0f0//EW8Ll//j7hrCjfQxYw X0+MXodKKzcYfimeGNbxG0IOuob9A9rzCu36QQ5Qw9d4q6o5HHzh5CIg3xcd3i+hxSVS yehDYA9ybB0eVcvKvlJTvBjYZb0yWwdsXBBWGvSdqrp5+DJ4HuEs6J2cS96NXadGelZK 0RiKSpNN5MoPjsit1BgY9W8jizb34gHzbWcme9YFzP7GMAIO0wP/ZyNZM2z4M/LAL1S4 oR6XAJoBwRKojLxURmc+gQSZY2H4s8V4vUqPNNMfsJtrg5imaj13yI8EvtKHAsnZRV9I KutA== X-Gm-Message-State: AOAM532j5yHdJJcMAzMWTyz5NiMeo0lLHjn9lze5Lj+/uulL7Ti8Cr6L 2n3ExSicvCSg9VT9W7pdMOR5jA5NDkRQGaOhyYuTL6+eeVd01b3ckOKqltEbjwddL4HSoggtOOd MuLfYqR5b8Db4iM6AA13JA4mC X-Received: by 2002:a05:6402:5194:: with SMTP id q20mr133631edd.250.1638290610137; Tue, 30 Nov 2021 08:43:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJw7hli+DY3t7ElKbLGU6EgcDLq8Vv8ccgtIr8S4/QihBPtDA4BWUIfAIYCoGi3N9iyEKiF0CQ== X-Received: by 2002:a05:6402:5194:: with SMTP id q20mr133614edd.250.1638290610000; Tue, 30 Nov 2021 08:43:30 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id kx3sm9157364ejc.112.2021.11.30.08.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:43:29 -0800 (PST) From: christian.ehrhardt@canonical.com To: Anoob Joseph Cc: dpdk stable Subject: patch 'common/cpt: fix KASUMI input length' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:48 +0100 Message-Id: <20211130163605.2460997-144-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/ffd8f8c733e5f515d13c96da65894c74a6ce5056 Thanks. Christian Ehrhardt --- >From ffd8f8c733e5f515d13c96da65894c74a6ce5056 Mon Sep 17 00:00:00 2001 From: Anoob Joseph Date: Thu, 11 Nov 2021 17:18:42 +0530 Subject: [PATCH] common/cpt: fix KASUMI input length [ upstream commit d937e872023373266e21784027938851533c6459 ] Fix kasumi input len calculation to consider encr_offset. Fixes: da39e3eccd3d ("common/cpt: support KASUMI") Signed-off-by: Anoob Joseph --- drivers/common/cpt/cpt_ucode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h index e92e3678c6..4d06625d4c 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -2310,7 +2310,7 @@ cpt_kasumi_dec_prep(uint64_t d_offs, /* consider iv len */ encr_offset += iv_len; - inputlen = iv_len + (RTE_ALIGN(encr_data_len, 8) / 8); + inputlen = encr_offset + (RTE_ALIGN(encr_data_len, 8) / 8); outputlen = inputlen; /* save space for offset ctrl & iv */ -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:14.224078778 +0100 +++ 0144-common-cpt-fix-KASUMI-input-length.patch 2021-11-30 16:50:06.022875232 +0100 @@ -1 +1 @@ -From d937e872023373266e21784027938851533c6459 Mon Sep 17 00:00:00 2001 +From ffd8f8c733e5f515d13c96da65894c74a6ce5056 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d937e872023373266e21784027938851533c6459 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 006411cd89..e015cf66a1 100644 +index e92e3678c6..4d06625d4c 100644 @@ -20 +21 @@ -@@ -2311,7 +2311,7 @@ cpt_kasumi_dec_prep(uint64_t d_offs, +@@ -2310,7 +2310,7 @@ cpt_kasumi_dec_prep(uint64_t d_offs,