[dpdk-stable] patch 'bpf: fix JSLT validation' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.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 06/14/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/2c6016c807a7f54fba1d76ad4789a6cf381d618b

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 2c6016c807a7f54fba1d76ad4789a6cf381d618b Mon Sep 17 00:00:00 2001
From: Hongbo Zheng <zhenghongbo3 at huawei.com>
Date: Thu, 22 Apr 2021 15:30:01 +0800
Subject: [PATCH] bpf: fix JSLT validation
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit cdcee2ec9b81457f9059c3f3a007e69190672634 ]

In function 'eval_jcc', judgment 'op == EBPF_JLT' occurs
twice, as a result, the corresponding second statement
cannot be accessed.

This patch fix this problem.

Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program")

Signed-off-by: Hongbo Zheng <zhenghongbo3 at huawei.com>
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
---
 lib/librte_bpf/bpf_validate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
index 9214f15038..7b1291b382 100644
--- a/lib/librte_bpf/bpf_validate.c
+++ b/lib/librte_bpf/bpf_validate.c
@@ -1115,7 +1115,7 @@ eval_jcc(struct bpf_verifier *bvf, const struct ebpf_insn *ins)
 		eval_jsgt_jsle(trd, trs, frd, frs);
 	else if (op == EBPF_JSLE)
 		eval_jsgt_jsle(frd, frs, trd, trs);
-	else if (op == EBPF_JLT)
+	else if (op == EBPF_JSLT)
 		eval_jslt_jsge(trd, trs, frd, frs);
 	else if (op == EBPF_JSGE)
 		eval_jslt_jsge(frd, frs, trd, trs);
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:56.975795600 +0800
+++ 0011-bpf-fix-JSLT-validation.patch	2021-06-12 06:53:56.020000000 +0800
@@ -1 +1 @@
-From cdcee2ec9b81457f9059c3f3a007e69190672634 Mon Sep 17 00:00:00 2001
+From 2c6016c807a7f54fba1d76ad4789a6cf381d618b Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit cdcee2ec9b81457f9059c3f3a007e69190672634 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
- lib/bpf/bpf_validate.c | 2 +-
+ lib/librte_bpf/bpf_validate.c | 2 +-
@@ -22 +24 @@
-diff --git a/lib/bpf/bpf_validate.c b/lib/bpf/bpf_validate.c
+diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
@@ -24,2 +26,2 @@
---- a/lib/bpf/bpf_validate.c
-+++ b/lib/bpf/bpf_validate.c
+--- a/lib/librte_bpf/bpf_validate.c
++++ b/lib/librte_bpf/bpf_validate.c