patch 'bpf: fix free function mismatch if convert fails' has been queued to stable release 21.11.9

[Kevin Traynor]

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 <stephen at networkplumber.org>
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 <stephen at networkplumber.org>
Acked-by: Morten Brørup <mb at smartsharesystems.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at huawei.com>
Acked-by: Wathsala Vithanage <wathsala.vithanage at arm.com>
---
 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 at 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__);