[PATCH] net: bpf_jit: fix BPF_S_ALU_AND_K compilation
From: Indan Zupancic <hidden>
Date: 2012-03-31 09:52:18
Also in:
lkml, stable
Subsystem:
bpf jit for x86 64-bit, bpf [general] (safe dynamic programs and tools), the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Hello, Finally, after much searching I found one little bug. [PATCH] net: bpf_jit: fix BPF_S_ALU_AND_K compilation Small typo resulted in bad code generation for certain values of K for the BPF_S_ALU_AND_K instruction. Signed-off-by: Indan Zupancic <redacted> ---
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 7c1b765..28bc807 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c@@ -289,7 +289,7 @@ void bpf_jit_compile(struct sk_filter *fp) EMIT2(0x24, K & 0xFF); /* and imm8,%al */ } else if (K >= 0xFFFF0000) { EMIT2(0x66, 0x25); /* and imm16,%ax */ - EMIT2(K, 2); + EMIT(K, 2); } else { EMIT1_off32(0x25, K); /* and imm32,%eax */ }