Skip to content

Commit

Permalink
sparc: Correct ctx->saw_frame_pointer logic.
Browse files Browse the repository at this point in the history
We need to initialize the frame pointer register not just if it is
seen as a source operand, but also if it is seen as the destination
operand of a store or an atomic instruction (which effectively is a
source operand).

This is exercised by test_verifier's "non-invalid fp arithmetic"

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
davem330 authored and Alexei Starovoitov committed Nov 27, 2018
1 parent c44768a commit e2ac579
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions arch/sparc/net/bpf_jit_comp_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -1270,6 +1270,9 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)
const u8 tmp2 = bpf2sparc[TMP_REG_2];
u32 opcode = 0, rs2;

if (insn->dst_reg == BPF_REG_FP)
ctx->saw_frame_pointer = true;

ctx->tmp_2_used = true;
emit_loadimm(imm, tmp2, ctx);

Expand Down Expand Up @@ -1308,6 +1311,9 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)
const u8 tmp = bpf2sparc[TMP_REG_1];
u32 opcode = 0, rs2;

if (insn->dst_reg == BPF_REG_FP)
ctx->saw_frame_pointer = true;

switch (BPF_SIZE(code)) {
case BPF_W:
opcode = ST32;
Expand Down Expand Up @@ -1340,6 +1346,9 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)
const u8 tmp2 = bpf2sparc[TMP_REG_2];
const u8 tmp3 = bpf2sparc[TMP_REG_3];

if (insn->dst_reg == BPF_REG_FP)
ctx->saw_frame_pointer = true;

ctx->tmp_1_used = true;
ctx->tmp_2_used = true;
ctx->tmp_3_used = true;
Expand All @@ -1360,6 +1369,9 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)
const u8 tmp2 = bpf2sparc[TMP_REG_2];
const u8 tmp3 = bpf2sparc[TMP_REG_3];

if (insn->dst_reg == BPF_REG_FP)
ctx->saw_frame_pointer = true;

ctx->tmp_1_used = true;
ctx->tmp_2_used = true;
ctx->tmp_3_used = true;
Expand Down

0 comments on commit e2ac579

Please sign in to comment.