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 A159045DB9 for ; Wed, 27 Nov 2024 18:21:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C9FB402E1; Wed, 27 Nov 2024 18:21:04 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id BDB8C4067E for ; Wed, 27 Nov 2024 18:21:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728063; 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=5jClwLax+I5+/+1h+sFsEBFtsKURxC9lKR6LnJemO2Q=; b=YFxS3uWraeY9czU05akXP3vNhfsCWpolLm96schUFzHuXWDlCc17zxabm7Kcsj0McpcHAP FUpETb6vaZ1LXZeZhCxEYySyNuFYh9ySetk3q+vG5datvfzgjRGHOmXBSEy1Hyjj4ucCra unfKCESMn8NvSl2ktidxPD5Z7A1oyK4= 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-375-G_mJJDFpO8SAhwKP3U6RwQ-1; Wed, 27 Nov 2024 12:21:01 -0500 X-MC-Unique: G_mJJDFpO8SAhwKP3U6RwQ-1 X-Mimecast-MFC-AGG-ID: G_mJJDFpO8SAhwKP3U6RwQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 D9D77195608B; Wed, 27 Nov 2024 17:21:00 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6BA7B300019E; Wed, 27 Nov 2024 17:20:59 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/tap: avoid memcpy with null argument' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:49 +0000 Message-ID: <20241127171916.690404-42-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: THicKnDUDuBkyh7eM9PBg5aBx1aJ1jqEVeXkkHTNH5Y_1732728061 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/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/8e3c135d81b7c4a61ada7dfe51f4b169b067a7f8 Thanks. Kevin --- >From 8e3c135d81b7c4a61ada7dfe51f4b169b067a7f8 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 13 Aug 2024 19:34:16 -0700 Subject: [PATCH] net/tap: avoid memcpy with null argument [ upstream commit 3975d85fb8606308ccdb6439b35f70e8733a78e8 ] Calling memcpy with a null pointer even if zero length is undefined, so check if data_length is zero. Problem reported by Gcc analyzer. Fixes: 7c25284e30c2 ("net/tap: add netlink back-end for flow API") Signed-off-by: Stephen Hemminger Acked-by: Ferruh Yigit --- drivers/net/tap/tap_netlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/tap/tap_netlink.c b/drivers/net/tap/tap_netlink.c index 75af3404b0..c1f7ff56da 100644 --- a/drivers/net/tap/tap_netlink.c +++ b/drivers/net/tap/tap_netlink.c @@ -302,5 +302,6 @@ tap_nlattr_add(struct nlmsghdr *nh, unsigned short type, rta->rta_len = RTA_LENGTH(data_len); rta->rta_type = type; - memcpy(RTA_DATA(rta), data, data_len); + if (data_len > 0) + memcpy(RTA_DATA(rta), data, data_len); nh->nlmsg_len = NLMSG_ALIGN(nh->nlmsg_len) + RTA_ALIGN(rta->rta_len); } -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.608212889 +0000 +++ 0042-net-tap-avoid-memcpy-with-null-argument.patch 2024-11-27 17:17:38.208269285 +0000 @@ -1 +1 @@ -From 3975d85fb8606308ccdb6439b35f70e8733a78e8 Mon Sep 17 00:00:00 2001 +From 8e3c135d81b7c4a61ada7dfe51f4b169b067a7f8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3975d85fb8606308ccdb6439b35f70e8733a78e8 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d9c260127d..35c491ac37 100644 +index 75af3404b0..c1f7ff56da 100644 @@ -23 +24 @@ -@@ -303,5 +303,6 @@ tap_nlattr_add(struct nlmsghdr *nh, unsigned short type, +@@ -302,5 +302,6 @@ tap_nlattr_add(struct nlmsghdr *nh, unsigned short type,