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 6686945804 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 290514337B; 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.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 12D3F43378 for ; Fri, 23 Aug 2024 18:19:50 +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=FnwMadCQWWjG7hRSZI7X5CvtqQMd/WG4y1EhXpCfHP8=; b=Ld2gafSdksEcxcYBFJ3IXtx8AnmaBk0xS3egT6YYGNLjqVtzaOP7UYnNABHnceMeTBlDVQ 0+i9dn1olk2FxP1Pry87Rvyq9U6L70qRQvmKig2fDjZscoLyYLDlcv2xhhXfLWKF34Mb2o CfTCbqIp592g/vmcbTC1MTIY+svf+us= Received: from mx-prod-mc-04.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-307-OtFKtV84Os6aJMYoDJa_iA-1; Fri, 23 Aug 2024 12:19:47 -0400 X-MC-Unique: OtFKtV84Os6aJMYoDJa_iA-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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4CAB419560B4; Fri, 23 Aug 2024 16:19:46 +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 19E9E1955F45; Fri, 23 Aug 2024 16:19:44 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'pcapng: add memcpy check' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:11 +0100 Message-ID: <20240823161929.1004778-3-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/d00c0049169b3b63f19e046bb25f61dd7525c428 Thanks. Kevin --- >From d00c0049169b3b63f19e046bb25f61dd7525c428 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 20 May 2024 18:01:03 -0700 Subject: [PATCH] pcapng: add memcpy check [ upstream commit 06f69f8fdbd218ed7a7d664ee49bd27ee1641cdd ] When adding option with no data, the rte_pcapng_add_option would call memcpy with src of NULL and size of zero. This generates a warning if fortify is enabled. Bugzilla ID: 1446 Fixes: 8d23ce8f5ee9 ("pcapng: add new library for writing pcapng files") Signed-off-by: Stephen Hemminger --- lib/pcapng/rte_pcapng.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c index e914b7b031..600a724bbb 100644 --- a/lib/pcapng/rte_pcapng.c +++ b/lib/pcapng/rte_pcapng.c @@ -110,5 +110,6 @@ pcapng_add_option(struct pcapng_option *popt, uint16_t code, popt->code = code; popt->length = len; - memcpy(popt->data, data, len); + if (len > 0) + memcpy(popt->data, data, len); return (struct pcapng_option *)((uint8_t *)popt + pcapng_optlen(len)); -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.053048023 +0100 +++ 0003-pcapng-add-memcpy-check.patch 2024-08-23 17:18:09.605429704 +0100 @@ -1 +1 @@ -From 06f69f8fdbd218ed7a7d664ee49bd27ee1641cdd Mon Sep 17 00:00:00 2001 +From d00c0049169b3b63f19e046bb25f61dd7525c428 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 06f69f8fdbd218ed7a7d664ee49bd27ee1641cdd ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index f74ec939a9..7254defce7 100644 +index e914b7b031..600a724bbb 100644 @@ -23 +24 @@ -@@ -129,5 +129,6 @@ pcapng_add_option(struct pcapng_option *popt, uint16_t code, +@@ -110,5 +110,6 @@ pcapng_add_option(struct pcapng_option *popt, uint16_t code,