Commit 876a7ae6 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller

bpf: fix 64-bit divide

ALU64_DIV instruction should be dividing 64-bit by 64-bit,
whereas do_div() does 64-bit by 32-bit divide.
x64 and arm64 JITs correctly implement 64 by 64 unsigned divide.
llvm BPF backend emits code assuming that ALU64_DIV does 64 by 64.

Fixes: 89aa0758 ("net: sock: allow eBPF programs to be attached to sockets")
Reported-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e046d68
...@@ -357,8 +357,8 @@ static unsigned int __bpf_prog_run(void *ctx, const struct bpf_insn *insn) ...@@ -357,8 +357,8 @@ static unsigned int __bpf_prog_run(void *ctx, const struct bpf_insn *insn)
ALU64_MOD_X: ALU64_MOD_X:
if (unlikely(SRC == 0)) if (unlikely(SRC == 0))
return 0; return 0;
tmp = DST; div64_u64_rem(DST, SRC, &tmp);
DST = do_div(tmp, SRC); DST = tmp;
CONT; CONT;
ALU_MOD_X: ALU_MOD_X:
if (unlikely(SRC == 0)) if (unlikely(SRC == 0))
...@@ -367,8 +367,8 @@ static unsigned int __bpf_prog_run(void *ctx, const struct bpf_insn *insn) ...@@ -367,8 +367,8 @@ static unsigned int __bpf_prog_run(void *ctx, const struct bpf_insn *insn)
DST = do_div(tmp, (u32) SRC); DST = do_div(tmp, (u32) SRC);
CONT; CONT;
ALU64_MOD_K: ALU64_MOD_K:
tmp = DST; div64_u64_rem(DST, IMM, &tmp);
DST = do_div(tmp, IMM); DST = tmp;
CONT; CONT;
ALU_MOD_K: ALU_MOD_K:
tmp = (u32) DST; tmp = (u32) DST;
...@@ -377,7 +377,7 @@ static unsigned int __bpf_prog_run(void *ctx, const struct bpf_insn *insn) ...@@ -377,7 +377,7 @@ static unsigned int __bpf_prog_run(void *ctx, const struct bpf_insn *insn)
ALU64_DIV_X: ALU64_DIV_X:
if (unlikely(SRC == 0)) if (unlikely(SRC == 0))
return 0; return 0;
do_div(DST, SRC); DST = div64_u64(DST, SRC);
CONT; CONT;
ALU_DIV_X: ALU_DIV_X:
if (unlikely(SRC == 0)) if (unlikely(SRC == 0))
...@@ -387,7 +387,7 @@ static unsigned int __bpf_prog_run(void *ctx, const struct bpf_insn *insn) ...@@ -387,7 +387,7 @@ static unsigned int __bpf_prog_run(void *ctx, const struct bpf_insn *insn)
DST = (u32) tmp; DST = (u32) tmp;
CONT; CONT;
ALU64_DIV_K: ALU64_DIV_K:
do_div(DST, IMM); DST = div64_u64(DST, IMM);
CONT; CONT;
ALU_DIV_K: ALU_DIV_K:
tmp = (u32) DST; tmp = (u32) DST;
......
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