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 E93FB45DB9 for ; Wed, 27 Nov 2024 18:19:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6043402DE; Wed, 27 Nov 2024 18:19:48 +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 B4E5A402DE for ; Wed, 27 Nov 2024 18:19:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732727986; 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=jlIPo9qeO3/jL0px/wkat/5bwDHfYnaUJauWdu8cu2A=; b=AbeaZ4Vqqbe/yOrZNmtkBqXJ3rZ9PmaNXN1gh2ziKnAdrGpgErAUe1WbUzroR40zJu2Ed+ hw6OcUmcKKItaU5DrM9VtXgp5My+bJjVLQ/5aHTVOFuelBiwtb1YFn9x+v8yyxN/R2MhUX 5urlezm3fHXOlH/fpsfkkvPHa+FIN+c= 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-163-0TVhYwwsO9e385RzlCEQkg-1; Wed, 27 Nov 2024 12:19:41 -0500 X-MC-Unique: 0TVhYwwsO9e385RzlCEQkg-1 X-Mimecast-MFC-AGG-ID: 0TVhYwwsO9e385RzlCEQkg 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 782AE19560AB; Wed, 27 Nov 2024 17:19:39 +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 31BC3300019E; Wed, 27 Nov 2024 17:19:36 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Konstantin Ananyev , Wathsala Vithanage , dpdk stable Subject: patch 'bpf: fix free function mismatch if convert fails' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:14 +0000 Message-ID: <20241127171916.690404-7-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: OxqEdjZsIx6CJPN3Af0AisOWUwvxgCdxGT8aN7B0W1Y_1732727979 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.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/330a28828fb5056e22b66a3adc91120e3eaff9dd Thanks. Kevin --- >From 330a28828fb5056e22b66a3adc91120e3eaff9dd Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 8 Oct 2024 09:47:11 -0700 Subject: [PATCH] bpf: fix free function mismatch if convert fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit a3923d6bd5c0b9838d8f4678233093ffad036193 ] If conversion of cBF to eBPF fails then an object allocated with rte_malloc() would be passed to free(). [908/3201] Compiling C object lib/librte_bpf.a.p/bpf_bpf_convert.c.o ../lib/bpf/bpf_convert.c: In function ‘rte_bpf_convert’: ../lib/bpf/bpf_convert.c:559:17: warning: ‘free’ called on pointer returned from a mismatched allocation function [-Wmismatched-dealloc] 559 | free(prm); | ^~~~~~~~~ ../lib/bpf/bpf_convert.c:545:15: note: returned from ‘rte_zmalloc’ 545 | prm = rte_zmalloc("bpf_filter", | ^~~~~~~~~~~~~~~~~~~~~~~~~ 546 | sizeof(*prm) + ebpf_len * sizeof(*ebpf), 0); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF") Signed-off-by: Stephen Hemminger Acked-by: Morten Brørup Acked-by: Konstantin Ananyev Acked-by: Wathsala Vithanage --- lib/bpf/bpf_convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bpf/bpf_convert.c b/lib/bpf/bpf_convert.c index 9563274c9c..024c9edc9e 100644 --- a/lib/bpf/bpf_convert.c +++ b/lib/bpf/bpf_convert.c @@ -560,5 +560,5 @@ rte_bpf_convert(const struct bpf_program *prog) if (ret < 0) { RTE_BPF_LOG(ERR, "%s: cannot convert cBPF to eBPF\n", __func__); - free(prm); + rte_free(prm); rte_errno = -ret; return NULL; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:38.565666502 +0000 +++ 0007-bpf-fix-free-function-mismatch-if-convert-fails.patch 2024-11-27 17:17:38.159269031 +0000 @@ -1 +1 @@ -From a3923d6bd5c0b9838d8f4678233093ffad036193 Mon Sep 17 00:00:00 2001 +From 330a28828fb5056e22b66a3adc91120e3eaff9dd Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit a3923d6bd5c0b9838d8f4678233093ffad036193 ] + @@ -26 +27,0 @@ -Cc: stable@dpdk.org @@ -37 +38 @@ -index d7ff2b4325..e7e298c9cb 100644 +index 9563274c9c..024c9edc9e 100644 @@ -40 +41 @@ -@@ -557,5 +557,5 @@ rte_bpf_convert(const struct bpf_program *prog) +@@ -560,5 +560,5 @@ rte_bpf_convert(const struct bpf_program *prog) @@ -42 +43 @@ - RTE_BPF_LOG_LINE(ERR, "%s: cannot convert cBPF to eBPF", __func__); + RTE_BPF_LOG(ERR, "%s: cannot convert cBPF to eBPF\n", __func__);