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 51242A0545 for ; Mon, 20 Jun 2022 11:48:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B9D241132; Mon, 20 Jun 2022 11:48:26 +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 32C6140150 for ; Mon, 20 Jun 2022 11:48:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655718503; 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=y2vejuGrXA05LYuN0plkWDv7jdotIZSYz0bLKBVK1Rw=; b=Z7Rm8Cez51cb6zYBSbbnv5taGuRx3rLuoSecmZAcT+Drn/8pFt1HTvuonkl/qElX6wv54X SDtZk17g0x/C2MLibHxhLFS5PMEqbMAMQUSywzu9tsoig3uIlIHIcgcO8f0MNkPCkNQbAA RU/by8izt7MdYZqMOiBLqNb7ORk+Nyc= 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-180-jxXlacx8NICmbBgx-QSmEA-1; Mon, 20 Jun 2022 05:48:20 -0400 X-MC-Unique: jxXlacx8NICmbBgx-QSmEA-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 10DB11C04B72; Mon, 20 Jun 2022 09:48:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id D55D940C141F; Mon, 20 Jun 2022 09:48:18 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Xiao Wang , Stephen Hemminger , dpdk stable Subject: patch 'vdpa/ifc: fix build with GCC 12' has been queued to stable release 21.11.2 Date: Mon, 20 Jun 2022 10:47:49 +0100 Message-Id: <20220620094752.1027299-16-ktraynor@redhat.com> In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com> References: <20220620094752.1027299-1-ktraynor@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=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 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/23/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/f85d0fc3975bb20a6cdbbef21408f3d8d00e2a3f Thanks. Kevin --- >From f85d0fc3975bb20a6cdbbef21408f3d8d00e2a3f Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 18 May 2022 12:16:54 +0200 Subject: [PATCH] vdpa/ifc: fix build with GCC 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 2a213b794fdd255fde7581a7c9bd034ab39e9b6a ] GCC 12 raises the following warning: ../drivers/vdpa/ifc/ifcvf_vdpa.c: In function ‘vdpa_enable_vfio_intr’: ../drivers/vdpa/ifc/ifcvf_vdpa.c:383:62: error: writing 4 bytes into a region of size 0 [-Werror=stringop-overflow=] 383 | fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = fd; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ ../drivers/vdpa/ifc/ifcvf_vdpa.c:348:14: note: at offset 32 into destination object ‘irq_set_buf’ of size 32 348 | char irq_set_buf[MSIX_IRQ_SET_BUF_LEN]; | ^~~~~~~~~~~ Validate number of vrings to avoid out of bound access. Bugzilla ID: 855 Signed-off-by: David Marchand Acked-by: Xiao Wang Acked-by: Stephen Hemminger --- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index 3853c4cf7e..6a915b0d5e 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -357,4 +357,6 @@ vdpa_enable_vfio_intr(struct ifcvf_internal *internal, bool m_rx) nr_vring = rte_vhost_get_vring_num(internal->vid); + if (nr_vring > IFCVF_MAX_QUEUES * 2) + return -1; irq_set = (struct vfio_irq_set *)irq_set_buf; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-20 10:46:28.129141593 +0100 +++ 0016-vdpa-ifc-fix-build-with-GCC-12.patch 2022-06-20 10:46:27.794146852 +0100 @@ -1 +1 @@ -From 2a213b794fdd255fde7581a7c9bd034ab39e9b6a Mon Sep 17 00:00:00 2001 +From f85d0fc3975bb20a6cdbbef21408f3d8d00e2a3f Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 2a213b794fdd255fde7581a7c9bd034ab39e9b6a ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -34 +35 @@ -index 40a18b2507..8bc971cb12 100644 +index 3853c4cf7e..6a915b0d5e 100644 @@ -37 +38 @@ -@@ -389,4 +389,6 @@ vdpa_enable_vfio_intr(struct ifcvf_internal *internal, bool m_rx) +@@ -357,4 +357,6 @@ vdpa_enable_vfio_intr(struct ifcvf_internal *internal, bool m_rx)