Commit ad962d20 authored by Nicolas Schichan's avatar Nicolas Schichan Committed by Greg Kroah-Hartman

bpf, arm: fix emit_ldx_r and emit_mov_i using TMP_REG_1

emit_ldx_r() and emit_a32_mov_i() were both using TMP_REG_1 and
clashing with each other. Using TMP_REG_2 in emit_ldx_r() fixes
the issue.

Fixes: ec19e02b ("ARM: net: bpf: fix LDX instructions")
Cc: Russell King <>
Signed-off-by: default avatarNicolas Schichan <>
Signed-off-by: default avatarDaniel Borkmann <>
Signed-off-by: default avatarSasha Levin <>
parent f1e1eb5c
......@@ -915,7 +915,7 @@ static inline void emit_str_r(const u8 dst, const u8 src, bool dstk,
/* dst = *(size*)(src + off) */
static inline void emit_ldx_r(const u8 dst[], const u8 src, bool dstk,
s32 off, struct jit_ctx *ctx, const u8 sz){
const u8 *tmp = bpf2a32[TMP_REG_1];
const u8 *tmp = bpf2a32[TMP_REG_2];
const u8 *rd = dstk ? tmp : dst;
u8 rm = src;
s32 off_max;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment