Commit 1d24fb36 authored by zhuangfeiran@ict.ac.cn's avatar zhuangfeiran@ict.ac.cn Committed by David S. Miller

x86 bpf_jit: fix a bug in emitting the 16-bit immediate operand of AND

When K >= 0xFFFF0000, AND needs the two least significant bytes of K as
its operand, but EMIT2() gives it the least significant byte of K and
0x2. EMIT() should be used here to replace EMIT2().
Signed-off-by: default avatarFeiran Zhuang  <zhuangfeiran@ict.ac.cn>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d26bb10
...@@ -289,7 +289,7 @@ void bpf_jit_compile(struct sk_filter *fp) ...@@ -289,7 +289,7 @@ void bpf_jit_compile(struct sk_filter *fp)
EMIT2(0x24, K & 0xFF); /* and imm8,%al */ EMIT2(0x24, K & 0xFF); /* and imm8,%al */
} else if (K >= 0xFFFF0000) { } else if (K >= 0xFFFF0000) {
EMIT2(0x66, 0x25); /* and imm16,%ax */ EMIT2(0x66, 0x25); /* and imm16,%ax */
EMIT2(K, 2); EMIT(K, 2);
} else { } else {
EMIT1_off32(0x25, K); /* and imm32,%eax */ EMIT1_off32(0x25, K); /* and imm32,%eax */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment