Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93771b01 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bpf-verifier-disassembly-improvements' 



Edward Cree says:

====================
bpf/verifier: disassembly improvements

Fix the output of print_bpf_insn() for ALU ops that don't look like
 compound assignment (i.e. BPF_END and BPF_NEG).

Sample output for a short test program:
0: (b4) (u32) r0 = (u32) 0
1: (dc) r0 = be32 r0
2: (84) r0 = (u32) -r0
3: (95) exit
processed 4 insns, stack depth 0
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4d8806fd 73c864b3

kernel/bpf/verifier.c

+21 −2
Original line number Diff line number Diff line
@@ -332,26 +332,45 @@ static const char *const bpf_jmp_string[16] = { 
	[BPF_EXIT >> 4] = "exit",

};



static void print_bpf_end_insn(const struct bpf_verifier_env *env,

			       const struct bpf_insn *insn)

{

	verbose("(%02x) r%d = %s%d r%d\n", insn->code, insn->dst_reg,

		BPF_SRC(insn->code) == BPF_TO_BE ? "be" : "le",

		insn->imm, insn->dst_reg);

}



static void print_bpf_insn(const struct bpf_verifier_env *env,

			   const struct bpf_insn *insn)

{

	u8 class = BPF_CLASS(insn->code);



	if (class == BPF_ALU || class == BPF_ALU64) {

		if (BPF_SRC(insn->code) == BPF_X)

		if (BPF_OP(insn->code) == BPF_END) {

			if (class == BPF_ALU64)

				verbose("BUG_alu64_%02x\n", insn->code);

			else

				print_bpf_end_insn(env, insn);

		} else if (BPF_OP(insn->code) == BPF_NEG) {

			verbose("(%02x) r%d = %s-r%d\n",

				insn->code, insn->dst_reg,

				class == BPF_ALU ? "(u32) " : "",

				insn->dst_reg);

		} else if (BPF_SRC(insn->code) == BPF_X) {

			verbose("(%02x) %sr%d %s %sr%d\n",

				insn->code, class == BPF_ALU ? "(u32) " : "",

				insn->dst_reg,

				bpf_alu_string[BPF_OP(insn->code) >> 4],

				class == BPF_ALU ? "(u32) " : "",

				insn->src_reg);

		else

		} else {

			verbose("(%02x) %sr%d %s %s%d\n",

				insn->code, class == BPF_ALU ? "(u32) " : "",

				insn->dst_reg,

				bpf_alu_string[BPF_OP(insn->code) >> 4],

				class == BPF_ALU ? "(u32) " : "",

				insn->imm);

		}

	} else if (class == BPF_STX) {

		if (BPF_MODE(insn->code) == BPF_MEM)

			verbose("(%02x) *(%s *)(r%d %+d) = r%d\n",