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 F3761A0548; Thu, 2 Jun 2022 12:08:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5EC940691; Thu, 2 Jun 2022 12:08:52 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 323C14021E; Thu, 2 Jun 2022 12:08:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654164531; x=1685700531; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=ObEasTlhb02srHqo9dwTbynxpfp/4Dkg+P1sXvr1eeg=; b=mpgtUNjDlX3XMiaqVS4TgqV+QGUcKh+yhE7TWCpE2LshsuvVv9yWNkKz 198C8o5QjhM3yJkMuZTBgc0TBPjr7WnnpdHyaE9w6EMR9KAlGKI9luZ2e zvXAuJXvJY5eIGdrHi2B7qIJl2pk/U4Q/4g7Pk6eWAgDgLGYiYkdtHqSJ wkce7EJkfuMOyRRhgxE7UZ6NtWCVZDSnII1s44toXZvvCfGCNeuf0crd+ GyNHcK6oH//B/uWwZS+wFgChDvHd7WoiMNxWPY6KlHuBxnhCzrbLv8A9y Db8JC2iP8r3+X0jxdVfLVEeHaFbh6VUF3mNqNlG0174RQjhnW66l4R+BH g==; X-IronPort-AV: E=McAfee;i="6400,9594,10365"; a="275908669" X-IronPort-AV: E=Sophos;i="5.91,270,1647327600"; d="scan'208";a="275908669" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2022 03:08:50 -0700 X-IronPort-AV: E=Sophos;i="5.91,270,1647327600"; d="scan'208";a="606767329" Received: from bricha3-mobl.ger.corp.intel.com ([10.55.133.25]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA; 02 Jun 2022 03:08:48 -0700 Date: Thu, 2 Jun 2022 11:08:45 +0100 From: Bruce Richardson To: David Marchand Cc: dev@dpdk.org, thomas@monjalon.net, ferruh.yigit@xilinx.com, stable@dpdk.org, Maxime Coquelin , Chenbo Xia , Fan Zhang Subject: Re: [PATCH 10/12] vhost/crypto: fix build with GCC 12 Message-ID: References: <20220518101657.1230416-1-david.marchand@redhat.com> <20220518101657.1230416-11-david.marchand@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220518101657.1230416-11-david.marchand@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 On Wed, May 18, 2022 at 12:16:55PM +0200, David Marchand wrote: > GCC 12 raises the following warning: > > In file included from ../lib/mempool/rte_mempool.h:46, > from ../lib/mbuf/rte_mbuf.h:38, > from ../lib/vhost/vhost_crypto.c:7: > ../lib/vhost/vhost_crypto.c: In function ‘rte_vhost_crypto_fetch_requests’: > ../lib/eal/x86/include/rte_memcpy.h:371:9: warning: array subscript 1 is > outside array bounds of ‘struct virtio_crypto_op_data_req[1]’ > [-Warray-bounds] > 371 | rte_mov32((uint8_t *)dst + 3 * 32, (const uint8_t *)src + 3 * 32); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ../lib/vhost/vhost_crypto.c:1178:42: note: while referencing ‘req’ > 1178 | struct virtio_crypto_op_data_req req; > | ^~~ > > Check that copied length is within req boundaries. > > Fixes: 3c79609fda7c ("vhost/crypto: handle virtually non-contiguous buffers") > Cc: stable@dpdk.org > > Signed-off-by: David Marchand > --- > lib/vhost/vhost_crypto.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c > index b1c0eb6a0f..83325b7042 100644 > --- a/lib/vhost/vhost_crypto.c > +++ b/lib/vhost/vhost_crypto.c > @@ -576,16 +576,16 @@ copy_data(void *dst_data, struct vhost_crypto_data_req *vc_req, > uint32_t to_copy; > uint8_t *data = dst_data; > uint8_t *src; > - int left = size; > + uint32_t left = size; > > - to_copy = RTE_MIN(desc->len, (uint32_t)left); > + to_copy = RTE_MIN(desc->len, left); > dlen = to_copy; > src = IOVA_TO_VVA(uint8_t *, vc_req, desc->addr, &dlen, > VHOST_ACCESS_RO); Tracking the functions which end up being called by this macro, the dlen parameter ends up being of type "uint64_t *", passing a value of int * or uint32_t * seems wrong to me. If we are changing the type from int to uint32_t, I think it should be promoted all the way to uint64_t. > - if (unlikely(!src || !dlen)) > + if (unlikely(!src || !dlen || dlen > left)) > return -1; > If this change is omitted, does the compiler still give warnings. Looking through the called code, the dlen parameter can only ever be reduced, not incremented (function rte_vhost_va_from_guest_pa() in rte_vhost.h). > - rte_memcpy((uint8_t *)data, src, dlen); > + rte_memcpy(data, src, dlen); > data += dlen; > > if (unlikely(dlen < to_copy)) { > -- > 2.36.1 >