From patchwork Wed Jun 22 15:30:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 113256 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EE9CBA034C; Wed, 22 Jun 2022 17:30:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D30EC40A84; Wed, 22 Jun 2022 17:30:37 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 99BC34069F for ; Wed, 22 Jun 2022 17:30:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655911835; 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; bh=jUNl2doafwupqTlrdf41ebKEBkGH4HiI5ali/eVeX3A=; b=OPxFGmNi80p529XDJcId1xywLv51D4VbdG8KhePJCloFlMO7FSA3rsRrfygaftY3VtDSIK 4i9zDnxs2iUxT2cYch5npUmx4LR/ERdPVmWG8DjovuWAmkcSX/JxXM7QNHf7jHA6l9i41F wIkwFKbC3j+uF1EKJDtZehySOcMs8T0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-155-azAn-T2WMF24vNuz-lQeLQ-1; Wed, 22 Jun 2022 11:30:33 -0400 X-MC-Unique: azAn-T2WMF24vNuz-lQeLQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B0AD1C0F689; Wed, 22 Jun 2022 15:30:33 +0000 (UTC) Received: from fchome.redhat.com (unknown [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A7AF40EC002; Wed, 22 Jun 2022 15:30:32 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: roy.fan.zhang@intel.com, Jakub Poczatek , Maxime Coquelin , Chenbo Xia Subject: [PATCH] vhost/crypto: fix descriptor processing Date: Wed, 22 Jun 2022 17:30:20 +0200 Message-Id: <20220622153020.2598037-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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: 7287660a21e0 ("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 96ffb82a5d..54946f46d9 100644 --- a/lib/vhost/vhost_crypto.c +++ b/lib/vhost/vhost_crypto.c @@ -610,8 +610,7 @@ copy_data(void *data, struct vhost_crypto_data_req *vc_req, return -1; 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)) return -1;