From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9E97FA051C for ; Tue, 11 Feb 2020 12:42:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4DBFB1C0B6; Tue, 11 Feb 2020 12:42:29 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id F15261C08C for ; Tue, 11 Feb 2020 12:42:27 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id g3so10870142wrs.12 for ; Tue, 11 Feb 2020 03:42:27 -0800 (PST) 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=EvJrXr8dUchWy37MCQIHsj6hYyQzA0oseUrrUYxqts4=; b=AeTsb1J1bSHhuoX3sotKol4OVpE8qSJ22WYPqlpDu2I0ux/+KdIdxCgW4lPGGKlavu MPJG+3OzNFtmZ7QbgUw0u4Q2piGYOff7baA0pmX1eOmvTQcDNnVy8AOtvS6v1IobnbGg 8B0YLbzTUR9+QqwHuc89hr3JlJ7SSTfndVfPEcrb9nbYopBoF2RV4qcUMbSHSpfsyb6u 41zRQeqAQ1MfXm54c3LWulBvnhQvt1k8jNw3XkS0STbwSiQACXKBTKBSaRBYqYFC51AV ZP6xRxzr8jB90EkiSyHynRJxP3yBlrKOOe/iBHzdh9tj9JSJo5hzQNtV3cmpSdtYimnb bBKg== 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=EvJrXr8dUchWy37MCQIHsj6hYyQzA0oseUrrUYxqts4=; b=Mi0QzVyLLFv7cOvOnTNnDMxLh8iQgnZ7GnMbNAiPjS9vG1K7PXMsqxFcRVsimawby+ Rfn5RLf+YYvJtNQMFGSiX9CQIHpEDhGX5v8kUVyrhYsTr5mFgZUl4ybhEGLk8+ucYQzo UFoiR65whoE9H9iVu06xRHXi+kp6/1ckDD46f15BGDspKO41COwh3nYYLiA8nOLoIld1 X/dXix73YogfGRRSXc7KenfA7ceEsizh3CDD4cEgfnTa9rvUfToFDRHa8HYT2E1iHTeo sSCqFM/39KuXoRF5/ZwIvZhXSfSIHQ/P2VI5TaZ523R55/DGlftP78/XFwDEzlaVU/YJ nxOQ== X-Gm-Message-State: APjAAAUZ3WSbe4Iom9RrDjqTIXSwVxlH3AYqDHLtBfwB1334t190Uk2C C9GgY0U4uJJuDo8jfs3CJUlBrFb0ENU= X-Google-Smtp-Source: APXvYqyyvdFpNi0oYMkblHAwbgPOHkKEFbpXwLBu744vm1vRPzEca42TMjIDa2jf/c+0zHd83wij+w== X-Received: by 2002:a5d:6151:: with SMTP id y17mr8075497wrt.110.1581421347667; Tue, 11 Feb 2020 03:42:27 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d13sm5098257wrc.64.2020.02.11.03.42.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:42:27 -0800 (PST) From: luca.boccassi@gmail.com To: Fan Zhang Cc: Maxime Coquelin , dpdk stable Date: Tue, 11 Feb 2020 11:22:05 +0000 Message-Id: <20200211112216.3929-179-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost/crypto: fix fetch size' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. 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. Thanks. Luca Boccassi --- >From c618ec477ab89e95b1146efcf4c845fec017032c Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 29 Jan 2020 10:24:22 +0000 Subject: [PATCH] vhost/crypto: fix fetch size [ upstream commit 03df3c7473dfd8f2efafe525b61ef980d0a68aa1 ] This patch fixes the incorrect rte_vhost_crypto_fetch_requests return value. Coverity issue: 343401 Fixes: 3bb595ecd682 ("vhost/crypto: add request handler") Signed-off-by: Fan Zhang Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_crypto.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c index 684fddc30b..68911972b6 100644 --- a/lib/librte_vhost/vhost_crypto.c +++ b/lib/librte_vhost/vhost_crypto.c @@ -1539,18 +1539,18 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid, if (unlikely(dev == NULL)) { VC_LOG_ERR("Invalid vid %i", vid); - return -EINVAL; + return 0; } if (unlikely(qid >= VHOST_MAX_QUEUE_PAIRS)) { VC_LOG_ERR("Invalid qid %u", qid); - return -EINVAL; + return 0; } vcrypto = (struct vhost_crypto *)dev->extern_data; if (unlikely(vcrypto == NULL)) { VC_LOG_ERR("Cannot find required data, is it initialized?"); - return -ENOENT; + return 0; } vq = dev->virtqueue[qid]; @@ -1572,7 +1572,7 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid, if (unlikely(rte_mempool_get_bulk(vcrypto->mbuf_pool, (void **)mbufs, count * 2) < 0)) { VC_LOG_ERR("Insufficient memory"); - return -ENOMEM; + return 0; } for (i = 0; i < count; i++) { @@ -1602,7 +1602,7 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid, if (unlikely(rte_mempool_get_bulk(vcrypto->mbuf_pool, (void **)mbufs, count) < 0)) { VC_LOG_ERR("Insufficient memory"); - return -ENOMEM; + return 0; } for (i = 0; i < count; i++) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:44.771527875 +0000 +++ 0179-vhost-crypto-fix-fetch-size.patch 2020-02-11 11:17:38.824009275 +0000 @@ -1,14 +1,15 @@ -From 03df3c7473dfd8f2efafe525b61ef980d0a68aa1 Mon Sep 17 00:00:00 2001 +From c618ec477ab89e95b1146efcf4c845fec017032c Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 29 Jan 2020 10:24:22 +0000 Subject: [PATCH] vhost/crypto: fix fetch size +[ upstream commit 03df3c7473dfd8f2efafe525b61ef980d0a68aa1 ] + This patch fixes the incorrect rte_vhost_crypto_fetch_requests return value. Coverity issue: 343401 Fixes: 3bb595ecd682 ("vhost/crypto: add request handler") -Cc: stable@dpdk.org Signed-off-by: Fan Zhang Reviewed-by: Maxime Coquelin