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 29259A0032 for ; Fri, 24 Jun 2022 17:02:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 215DA400EF; Fri, 24 Jun 2022 17:02:57 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C70D2400EF for ; Fri, 24 Jun 2022 17:02:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082975; 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=ntGE/Rup9e4JyqQsk3VZ3owArTLD0GNNgrNuXT5UuGA=; b=HvvXYeVZGapraiRatT3K2bDUTvWkMwfsuzwY/F1uJ9nVVCLId4m5PmfWoUHzL1JPvILPsG +JFJWSxv+MJ8fn7RwNXa9VLhXRWpMLMDmWPSkxVxHZ6QYPh4eeJd3ePqU4u2rr6sf5ogq1 s7w1MpMPMqMXv+owBZ4JnErOUWlL/8A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-484-PyIymXZMNgOaot3tPQ9UjA-1; Fri, 24 Jun 2022 11:02:52 -0400 X-MC-Unique: PyIymXZMNgOaot3tPQ9UjA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 34075802D1F; Fri, 24 Jun 2022 15:02:51 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBBD110725; Fri, 24 Jun 2022 15:02:49 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Jakub Poczatek , Maxime Coquelin , Fan Zhang , dpdk stable Subject: patch 'vhost/crypto: fix descriptor processing' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:47 +0100 Message-Id: <20220624150148.1855580-39-ktraynor@redhat.com> In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com> References: <20220624150148.1855580-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.2 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/27/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d6e4e0f46e27a5eae66ce436b522c7602accf346 Thanks. Kevin --- >From d6e4e0f46e27a5eae66ce436b522c7602accf346 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 22 Jun 2022 17:30:20 +0200 Subject: [PATCH] vhost/crypto: fix descriptor processing [ upstream commit 2fbada91545c004f04449500af0c6276900317ab ] copy_data was returning a pointer to an increased (off by one) descriptor. Subsequent calls to copy_data in the library were then failing. Fix this by incrementing the descriptor only if there is some left data to copy. Fixes: 4414bb67010d ("vhost/crypto: fix build with GCC 12") Reported-by: Jakub Poczatek Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin Tested-by: Jakub Poczatek Acked-by: Fan Zhang --- lib/vhost/vhost_crypto.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c index 293960d350..7d1d6a1861 100644 --- a/lib/vhost/vhost_crypto.c +++ b/lib/vhost/vhost_crypto.c @@ -611,6 +611,5 @@ copy_data(void *data, struct vhost_crypto_data_req *vc_req, left -= copied; data = RTE_PTR_ADD(data, copied); - desc++; - } while (desc < head + max_n_descs && left != 0); + } while (left != 0 && ++desc < head + max_n_descs); if (unlikely(left != 0)) -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:10.072955313 +0100 +++ 0044-vhost-crypto-fix-descriptor-processing.patch 2022-06-24 15:51:08.934984252 +0100 @@ -1 +1 @@ -From 2fbada91545c004f04449500af0c6276900317ab Mon Sep 17 00:00:00 2001 +From d6e4e0f46e27a5eae66ce436b522c7602accf346 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2fbada91545c004f04449500af0c6276900317ab ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 96ffb82a5d..54946f46d9 100644 +index 293960d350..7d1d6a1861 100644