This is a note to let you know that I've just added the patch titled
bpf, x86_32: Fix logic error in BPF_LDX zero-extension
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bpf-x86_32-fix-logic-error-in-bpf_ldx-zero-extension.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5ca1ca01fae1e90f8d010eb1d83374f28dc11ee6 Mon Sep 17 00:00:00 2001
From: Wang YanQing <udknight@xxxxxxxxx>
Date: Thu, 23 Apr 2020 13:06:37 +0800
Subject: bpf, x86_32: Fix logic error in BPF_LDX zero-extension
From: Wang YanQing <udknight@xxxxxxxxx>
commit 5ca1ca01fae1e90f8d010eb1d83374f28dc11ee6 upstream.
When verifier_zext is true, we don't need to emit code
for zero-extension.
Fixes: 836256bf5f37 ("x32: bpf: eliminate zero extension code-gen")
Signed-off-by: Wang YanQing <udknight@xxxxxxxxx>
Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxx>
Link: https://lore.kernel.org/bpf/20200423050637.GA4029@udknight
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/net/bpf_jit_comp32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/x86/net/bpf_jit_comp32.c
+++ b/arch/x86/net/bpf_jit_comp32.c
@@ -1847,7 +1847,7 @@ static int do_jit(struct bpf_prog *bpf_p
case BPF_B:
case BPF_H:
case BPF_W:
- if (!bpf_prog->aux->verifier_zext)
+ if (bpf_prog->aux->verifier_zext)
break;
if (dstk) {
EMIT3(0xC7, add_1reg(0x40, IA32_EBP),
Patches currently in stable-queue which might be from udknight@xxxxxxxxx are
queue-5.4/bpf-x86_32-fix-incorrect-encoding-in-bpf_ldx-zero-extension.patch
queue-5.4/bpf-x86_32-fix-logic-error-in-bpf_ldx-zero-extension.patch
queue-5.4/bpf-x86_32-fix-clobbering-of-dst-for-bpf_jset.patch
