* [PATCH] net: bpf_jit: fix BPF_S_ALU_AND_K compilation
@ 2012-03-31 9:52 Indan Zupancic
2012-03-31 10:23 ` Eric Dumazet
2012-03-31 15:13 ` Greg KH
0 siblings, 2 replies; 4+ messages in thread
From: Indan Zupancic @ 2012-03-31 9:52 UTC (permalink / raw)
To: Eric Dumazet; +Cc: netdev, stable, linux-kernel
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 <indan@nul.nu>
---
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 */
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] net: bpf_jit: fix BPF_S_ALU_AND_K compilation
2012-03-31 9:52 [PATCH] net: bpf_jit: fix BPF_S_ALU_AND_K compilation Indan Zupancic
@ 2012-03-31 10:23 ` Eric Dumazet
2012-03-31 15:13 ` Greg KH
1 sibling, 0 replies; 4+ messages in thread
From: Eric Dumazet @ 2012-03-31 10:23 UTC (permalink / raw)
To: Indan Zupancic; +Cc: netdev, stable, linux-kernel
On Sat, 2012-03-31 at 20:52 +1100, Indan Zupancic wrote:
> 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 <indan@nul.nu>
> ---
>
> 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 */
> }
>
>
Thanks but it was already fixed.
commit 1d24fb3684f347226747c6b11ea426b7b992694e
Author: zhuangfeiran@ict.ac.cn <zhuangfeiran@ict.ac.cn>
Date: Wed Mar 28 23:27:00 2012 +0000
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>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] net: bpf_jit: fix BPF_S_ALU_AND_K compilation
2012-03-31 9:52 [PATCH] net: bpf_jit: fix BPF_S_ALU_AND_K compilation Indan Zupancic
2012-03-31 10:23 ` Eric Dumazet
@ 2012-03-31 15:13 ` Greg KH
2012-03-31 23:47 ` Indan Zupancic
1 sibling, 1 reply; 4+ messages in thread
From: Greg KH @ 2012-03-31 15:13 UTC (permalink / raw)
To: Indan Zupancic; +Cc: Eric Dumazet, netdev, stable, linux-kernel
On Sat, Mar 31, 2012 at 08:52:09PM +1100, Indan Zupancic wrote:
> 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 <indan@nul.nu>
> ---
>
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read Documentation/stable_kernel_rules.txt
for how to do this properly.
</formletter>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-31 23:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-31 9:52 [PATCH] net: bpf_jit: fix BPF_S_ALU_AND_K compilation Indan Zupancic
2012-03-31 10:23 ` Eric Dumazet
2012-03-31 15:13 ` Greg KH
2012-03-31 23:47 ` Indan Zupancic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).