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 0FB6745804 for ; Fri, 23 Aug 2024 18:19:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 09114402BE; Fri, 23 Aug 2024 18:19:53 +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 3956A43379 for ; Fri, 23 Aug 2024 18:19:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724429990; 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=w+XpKyBqMzLstaSIpHlHw1haH4yP2dmiUDV7hCoGvbU=; b=DvaOlqMccFF9QQFit3Q3rFmH4Z1sRVS260EplBpnYmSGayON4BeCUGhZKuNrWFx14KkYKD bBDkeaoF66bV5hUh4O7HSZXbYMGnhN9+cidQoI+3USsAN3Cf8SFM6wwP2ZikLlFA0+rFbh 1kx+CGI9PGBmj9nf+O8mU6WsGAoqrS0= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-674-5wqfX9v5PieVhN-eR1V2Pg-1; Fri, 23 Aug 2024 12:19:49 -0400 X-MC-Unique: 5wqfX9v5PieVhN-eR1V2Pg-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 328CB195608A; Fri, 23 Aug 2024 16:19:48 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AD3E11955F44; Fri, 23 Aug 2024 16:19:46 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/virtio-user: add memcpy check' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:12 +0100 Message-ID: <20240823161929.1004778-4-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/bd0e6505202a549377e0049d840409d2e4159d44 Thanks. Kevin --- >From bd0e6505202a549377e0049d840409d2e4159d44 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 20 May 2024 18:01:04 -0700 Subject: [PATCH] net/virtio-user: add memcpy check [ upstream commit 0ad961387e94a9ccfc1484a1d742d6f79eda9cd9 ] If fortify is enabled, it will generate a warning if memcpy src is NULL even if size is zero. This happens if the MP message sync is called with no file descriptors. Bugzilla ID: 1446 Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer") Signed-off-by: Stephen Hemminger --- drivers/net/virtio/virtio_user/vhost_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c index 77820bf967..df383bd8e6 100644 --- a/drivers/net/virtio/virtio_user/vhost_user.c +++ b/drivers/net/virtio/virtio_user/vhost_user.c @@ -130,5 +130,6 @@ vhost_user_write(int fd, struct vhost_user_msg *msg, int *fds, int fd_num) cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = SCM_RIGHTS; - memcpy(CMSG_DATA(cmsg), fds, fd_size); + if (fd_size > 0) + memcpy(CMSG_DATA(cmsg), fds, fd_size); do { -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.099093720 +0100 +++ 0004-net-virtio-user-add-memcpy-check.patch 2024-08-23 17:18:09.606429707 +0100 @@ -1 +1 @@ -From 0ad961387e94a9ccfc1484a1d742d6f79eda9cd9 Mon Sep 17 00:00:00 2001 +From bd0e6505202a549377e0049d840409d2e4159d44 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0ad961387e94a9ccfc1484a1d742d6f79eda9cd9 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 3c05ac9cc0..c10252506b 100644 +index 77820bf967..df383bd8e6 100644 @@ -23 +24 @@ -@@ -129,5 +129,6 @@ vhost_user_write(int fd, struct vhost_user_msg *msg, int *fds, int fd_num) +@@ -130,5 +130,6 @@ vhost_user_write(int fd, struct vhost_user_msg *msg, int *fds, int fd_num)