diff options
| author | zhuangfeiran@ict.ac.cn <zhuangfeiran@ict.ac.cn> | 2012-03-28 23:27:00 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-13 08:14:05 -0700 |
| commit | 62a48bcddfa2b4cabef5b58564cb7d843658fe19 (patch) | |
| tree | 509df58ebfc5cdf8c02d05b01883a9173a4ee3de /arch/x86/net | |
| parent | 8aa122f38398503c72a83f15c815e84e6e6e6890 (diff) | |
| download | kernel_samsung_crespo-62a48bcddfa2b4cabef5b58564cb7d843658fe19.zip kernel_samsung_crespo-62a48bcddfa2b4cabef5b58564cb7d843658fe19.tar.gz kernel_samsung_crespo-62a48bcddfa2b4cabef5b58564cb7d843658fe19.tar.bz2 | |
x86 bpf_jit: fix a bug in emitting the 16-bit immediate operand of AND
[ Upstream commit 1d24fb3684f347226747c6b11ea426b7b992694e ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/net')
| -rw-r--r-- | arch/x86/net/bpf_jit_comp.c | 2 |
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 5671752..5a5b6e4 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 */ } |