summaryrefslogtreecommitdiffstats
path: root/arch/x86/net
diff options
context:
space:
mode:
authorzhuangfeiran@ict.ac.cn <zhuangfeiran@ict.ac.cn>2012-03-28 23:27:00 +0000
committerDavid S. Miller <davem@davemloft.net>2012-03-29 18:12:59 -0400
commit1d24fb3684f347226747c6b11ea426b7b992694e (patch)
treea55c7cdfcb751c20f5d89502d5f99127cd34acb9 /arch/x86/net
parent7d26bb103c4162003bfdf1d63aaa32b548ad0e9a (diff)
downloadblackbird-op-linux-1d24fb3684f347226747c6b11ea426b7b992694e.tar.gz
blackbird-op-linux-1d24fb3684f347226747c6b11ea426b7b992694e.zip
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: Feiran Zhuang <zhuangfeiran@ict.ac.cn> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/net')
-rw-r--r--arch/x86/net/bpf_jit_comp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 5671752f8d9c..5a5b6e4dd738 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 */
}
OpenPOWER on IntegriCloud