Commit 2b589a7e authored by Wang YanQing's avatar Wang YanQing Committed by Daniel Borkmann

bpf, arm32: correct check_imm24

imm24 is signed, so the right range is:

  [-(1<<(24 - 1)), (1<<(24 - 1)) - 1]

Note: this patch also fix a typo.

Fixes: 39c13c20 ("arm: eBPF JIT compiler")
Signed-off-by: default avatarWang YanQing <udknight@gmail.com>
Cc: Shubham Bansal <illusionist.neo@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux@armlinux.org.uk
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 34ea38ca
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
* *
* 1. First argument is passed using the arm 32bit registers and rest of the * 1. First argument is passed using the arm 32bit registers and rest of the
* arguments are passed on stack scratch space. * arguments are passed on stack scratch space.
* 2. First callee-saved arugument is mapped to arm 32 bit registers and rest * 2. First callee-saved argument is mapped to arm 32 bit registers and rest
* arguments are mapped to scratch space on stack. * arguments are mapped to scratch space on stack.
* 3. We need two 64 bit temp registers to do complex operations on eBPF * 3. We need two 64 bit temp registers to do complex operations on eBPF
* registers. * registers.
...@@ -1192,8 +1192,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) ...@@ -1192,8 +1192,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)
s32 jmp_offset; s32 jmp_offset;
#define check_imm(bits, imm) do { \ #define check_imm(bits, imm) do { \
if ((((imm) > 0) && ((imm) >> (bits))) || \ if ((imm) >= (1 << ((bits) - 1)) || \
(((imm) < 0) && (~(imm) >> (bits)))) { \ (imm) < -(1 << ((bits) - 1))) { \
pr_info("[%2d] imm=%d(0x%x) out of range\n", \ pr_info("[%2d] imm=%d(0x%x) out of range\n", \
i, imm, imm); \ i, imm, imm); \
return -EINVAL; \ return -EINVAL; \
......
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