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 0E87FA0A02 for ; Mon, 17 May 2021 18:16:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08F8140041; Mon, 17 May 2021 18:16:27 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D101940041 for ; Mon, 17 May 2021 18:16:25 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifup-0008Kn-TS; Mon, 17 May 2021 16:16:23 +0000 From: Christian Ehrhardt To: Hongbo Zheng Cc: Min Hu , Konstantin Ananyev , dpdk stable Date: Mon, 17 May 2021 18:09:39 +0200 Message-Id: <20210517161039.3132619-150-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bpf: fix JSLT validation' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 05/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/5fe55756ed23b289cacd787caa5da24c0afbb92a Thanks. Christian Ehrhardt --- >From 5fe55756ed23b289cacd787caa5da24c0afbb92a Mon Sep 17 00:00:00 2001 From: Hongbo Zheng Date: Thu, 22 Apr 2021 15:30:01 +0800 Subject: [PATCH] bpf: fix JSLT validation [ 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 Signed-off-by: Min Hu (Connor) Acked-by: Konstantin Ananyev --- 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 80d21fabbe..21ee106649 100644 --- a/lib/librte_bpf/bpf_validate.c +++ b/lib/librte_bpf/bpf_validate.c @@ -1075,7 +1075,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.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:35.285771712 +0200 +++ 0150-bpf-fix-JSLT-validation.patch 2021-05-17 17:40:29.427811493 +0200 @@ -1 +1 @@ -From cdcee2ec9b81457f9059c3f3a007e69190672634 Mon Sep 17 00:00:00 2001 +From 5fe55756ed23b289cacd787caa5da24c0afbb92a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cdcee2ec9b81457f9059c3f3a007e69190672634 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - lib/bpf/bpf_validate.c | 2 +- + lib/librte_bpf/bpf_validate.c | 2 +- @@ -22,5 +23,5 @@ -diff --git a/lib/bpf/bpf_validate.c b/lib/bpf/bpf_validate.c -index 9214f15038..7b1291b382 100644 ---- a/lib/bpf/bpf_validate.c -+++ b/lib/bpf/bpf_validate.c -@@ -1115,7 +1115,7 @@ eval_jcc(struct bpf_verifier *bvf, const struct ebpf_insn *ins) +diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c +index 80d21fabbe..21ee106649 100644 +--- a/lib/librte_bpf/bpf_validate.c ++++ b/lib/librte_bpf/bpf_validate.c +@@ -1075,7 +1075,7 @@ eval_jcc(struct bpf_verifier *bvf, const struct ebpf_insn *ins)