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 997C245610 for ; Fri, 12 Jul 2024 12:46:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C63C402E5; Fri, 12 Jul 2024 12:46:25 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2055.outbound.protection.outlook.com [40.107.244.55]) by mails.dpdk.org (Postfix) with ESMTP id 8FC0F40261 for ; Fri, 12 Jul 2024 12:46:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wkBVsgiM14CvTUlBg199q8J2RL5v//wI18Sh/0J1BqXT3xzJ/YsXQEu44Tk3WEctDS88JK+wh8U3chBWAPMAu9MWPKnwYe6gWckO71rRzdIKnW0vcOqsRiASq9ZAur/M/Trenhwg4GfGBUysuWYwFayDm3A7CJHe2Jy0EuSVEekemaVb5+xHIBYw/wtU+JDg4mDQ2LRqKwSDTtWM9XO3AnChOnPx7Xgo3pzPfq3QgVlVjjh+9PVc2/OnRTaIcpg04BQj5CKpb9YSynBW3z/WEw2BgCCmuxBltgkj4UAru2eDfhaYHCOzqZ+KH4bGQNgUqfoYci5igOYQgyTVytwZkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7yOojOrWHrBqHvdadfzuBCLVuMjMs5FQXblcbDP1wvo=; b=Iq4JBVvDlTkp9b6D2MHiVdPFnIrvfqWzNO5zXuPw6ybPAP+hAF6PJ8EZ9145aGeS3DZWyJTEPIuRnv/+a4HDKpPK0lZrHt1UaxdybrKgmAkwXO4JEwLQvHzAQJnnkGyNpLs/QDovZIYRx8tKlaC5YD2Q5TWCgxap++7A18Eu8PgzyyD0HTHbQVk3KWS91sWtdaPS6GBIIgmKVlZrxakXsMkWdvo03r3j7rF8fpYJAH7w7pzUGVIE6n2y1lFsujdDmC0mEqZLi7yNpO3zG1GAt0eo1ffPUoR6yVtg1h1h7XILr2j6zLcox0eLTweRT4C9lmiy7x6cpJZgpR/ZRAg+kw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7yOojOrWHrBqHvdadfzuBCLVuMjMs5FQXblcbDP1wvo=; b=m+j3Y9qFHGHaGymDEWP8ILYXMe2UkHXQMC9FpLU7n6ImVuGinmwuOCY+k2e8yTj1CnNYhVM/Yr9RPjyTi3lXYsIK4/Sp27FfpNZYRqDRCYuGNmbtkJmYzTcvkWoY/n4/IFYvyvDdi5BaIzunV3kPZdvPRrgIoKcsYR/F8BLxm/16nefjxe4HSVTZtOBO5k0KBgotFAAUrk2JhIihMKjBaHoxW25Jvs1W5RIJTU3ho/D4Zb9+Bg47MyQhRItOp1w9ku5c5wFQ7hKbcWHdwRtgncgdzP9Kk9TKu1nOgUX2z6GDjwhBUvkaZei9lTn1OHpl/cb0pBMnyccTCyyDrm2oDg== Received: from MW4PR03CA0173.namprd03.prod.outlook.com (2603:10b6:303:8d::28) by BL3PR12MB6642.namprd12.prod.outlook.com (2603:10b6:208:38e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Fri, 12 Jul 2024 10:46:21 +0000 Received: from SJ1PEPF000023D4.namprd21.prod.outlook.com (2603:10b6:303:8d:cafe::34) by MW4PR03CA0173.outlook.office365.com (2603:10b6:303:8d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35 via Frontend Transport; Fri, 12 Jul 2024 10:46:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF000023D4.mail.protection.outlook.com (10.167.244.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:46:20 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:46:13 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:46:12 -0700 From: Xueming Li To: Stephen Hemminger CC: dpdk stable Subject: patch 'net/virtio-user: add memcpy check' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:43:51 +0800 Message-ID: <20240712104528.308638-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000023D4:EE_|BL3PR12MB6642:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b62be61-297e-4f22-9e1c-08dca25fdd80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?I2u3iV8NlW7u+tuRZkI0WIFqJihHaB2YInlVM/1sFPii/RqlK6LBqGUn23R7?= =?us-ascii?Q?n3bOWqcDkagBQRVINBccBztIt3O8cf56vKAxkgSULF0aau/ZrtYYzUSM25LA?= =?us-ascii?Q?bIvHt5UZ6DWIqvMG4Eu+SaMmtPsiQfnFKs1lHSfFv4tv56BZUXJhWo2BYYlA?= =?us-ascii?Q?uXPDajDXGQ6njrgr87XqzMDCePHQhTQu3JZfpjR+Tyir/3Y0lyJBkFrliWT7?= =?us-ascii?Q?0ojrWkwCtkzF0vE8pHv6mUXcZeAuoRsfz+sSMEaNjRLT1I9K3LJSdSz4FVOy?= =?us-ascii?Q?tO17Lanu82atPt2V4BjP+gc6JBwgsrIL5u+BIPHvcjQrzAzjahKQQcEuCZFL?= =?us-ascii?Q?aMdA/EraV4kj3MIuh/EOhGeW8b0gAWbB+F6wybvYwPH4BUmBu+AiXA050iMJ?= =?us-ascii?Q?66aazS9txJUQn5JQhCsQ1sPNmv/Bsd3awvn3VT6Vnqw7tJWJ20Gulis68tmx?= =?us-ascii?Q?zBnXL1nOl6Y7OxOlJDQsBVqu125k8LGIcBPd7BBQ+uI/XR3KY8q2QADGKF/E?= =?us-ascii?Q?LX0TRrb9oKvBSAhY3mRbo9vqQmGlc4esZOZj4Pe7uyggAeTmgvo8jMemZ6ik?= =?us-ascii?Q?zq2hYcXFmkmoUdvgp2wu/n+J36n3sRZfoHydFgQ4mU/V8sZhibVaiDNj2JB6?= =?us-ascii?Q?+WC5r82bNsFLIgBPg1OJpjL8yTF7WUOvJVZ7/SRj6OwY55Lq79wtEj8H1xbC?= =?us-ascii?Q?R9yvBrLhuvDz91b9vghepu/8tvOU5vQHv64a+3MYrXGMRcrjrHggAutuToA9?= =?us-ascii?Q?+phwZgXbTUL441cjYxJ+docgbDdwok7vDg43rsvLEIsiPXH+e5UMnc40tyBl?= =?us-ascii?Q?WW5yG9/iLJOGphdSJfo6nmWxV9Is0HiGXbe9B9UL8mCPlzCCCRkU8Boc2GWD?= =?us-ascii?Q?K0ZkjF888OzkxU6oDzEqV2zknKtzrmD73LcwXPZo5Sccwgk/O8GXrVNGH40e?= =?us-ascii?Q?PrjPWVZ5SOgri5lZI3GrYgU+HwK/bSaNJbAh5bXXeL2SLEdV1Ls7Q+jHmGUZ?= =?us-ascii?Q?6npHIoIwhV/vI49zFOZ62ZqCVb0oLmm/CRROENZXDwZU+CW8SmUqBTT6fYvd?= =?us-ascii?Q?kWZsZja8tNCKQVJ+TYmUmB62uOUNENZ62qmx+mFmpr2ExVS1/Vht19e0d49q?= =?us-ascii?Q?FmFZSjVtnuGrSsfI8qWxaYmoqkL8LyW3yxVOB4QlMB3UwkOM12+GSYBb4f71?= =?us-ascii?Q?0zCaV3QTRvy6SUsqgyYT1Jg/t8Q9UPv0Yme+cG6FMfa5eILfn82Fbr0Px+Ae?= =?us-ascii?Q?9ksi/cNIS+jxcoWNeo6cWKsox2qxGku1GSZ2NwImxiSaLVSq6sFVVfSMEwva?= =?us-ascii?Q?XL5vvNc7yHFJv2SwDGnq8FJE1oDMo0zbscINVEGDtx/Tqcij1+hgEw3rjojj?= =?us-ascii?Q?8RyfTherWl4KKKEXXwPK26pTkT7LvVYpCzHt1KHxJUN1G+j8jYWMP+2PXwFL?= =?us-ascii?Q?GLULSmXhE9znfgL9nluefrLvNMHiHUY2?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:46:20.1241 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b62be61-297e-4f22-9e1c-08dca25fdd80 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000023D4.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6642 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 23.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 07/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=8ff4ebb7fcbe853070265f9f676acd4b917b1783 Thanks. Xueming Li --- >From 8ff4ebb7fcbe853070265f9f676acd4b917b1783 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 Cc: Xueming Li [ 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 3c05ac9cc0..c10252506b 100644 --- a/drivers/net/virtio/virtio_user/vhost_user.c +++ b/drivers/net/virtio/virtio_user/vhost_user.c @@ -128,7 +128,8 @@ vhost_user_write(int fd, struct vhost_user_msg *msg, int *fds, int fd_num) cmsg->cmsg_len = CMSG_LEN(fd_size); 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 { r = sendmsg(fd, &msgh, 0); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:14.609189567 +0800 +++ 0005-net-virtio-user-add-memcpy-check.patch 2024-07-12 18:40:13.906594251 +0800 @@ -1 +1 @@ -From 0ad961387e94a9ccfc1484a1d742d6f79eda9cd9 Mon Sep 17 00:00:00 2001 +From 8ff4ebb7fcbe853070265f9f676acd4b917b1783 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0ad961387e94a9ccfc1484a1d742d6f79eda9cd9 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org