Commit 105faa87 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 



Daniel Borkmann says:

====================
pull-request: bpf-next 2020-10-15

The main changes are:

1) Fix register equivalence tracking in verifier, from Alexei Starovoitov.

2) Fix sockmap error path to not call bpf_prog_put() with NULL, from Alex Dewar.

3) Fix sockmap to add locking annotations to iterator, from Lorenz Bauer.

4) Fix tcp_hdr_options test to use loopback address, from Martin KaFai Lau.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2295cddf 83c11c17

kernel/bpf/verifier.c

+25 −13
Original line number Diff line number Diff line
@@ -1010,14 +1010,9 @@ static const int caller_saved[CALLER_SAVED_REGS] = { 
static void __mark_reg_not_init(const struct bpf_verifier_env *env,

				struct bpf_reg_state *reg);



/* Mark the unknown part of a register (variable offset or scalar value) as

 * known to have the value @imm.

 */

static void __mark_reg_known(struct bpf_reg_state *reg, u64 imm)

/* This helper doesn't clear reg->id */

static void ___mark_reg_known(struct bpf_reg_state *reg, u64 imm)

{

	/* Clear id, off, and union(map_ptr, range) */

	memset(((u8 *)reg) + sizeof(reg->type), 0,

	       offsetof(struct bpf_reg_state, var_off) - sizeof(reg->type));

	reg->var_off = tnum_const(imm);

	reg->smin_value = (s64)imm;

	reg->smax_value = (s64)imm;
@@ -1030,6 +1025,17 @@ static void __mark_reg_known(struct bpf_reg_state *reg, u64 imm) 
	reg->u32_max_value = (u32)imm;

}



/* Mark the unknown part of a register (variable offset or scalar value) as

 * known to have the value @imm.

 */

static void __mark_reg_known(struct bpf_reg_state *reg, u64 imm)

{

	/* Clear id, off, and union(map_ptr, range) */

	memset(((u8 *)reg) + sizeof(reg->type), 0,

	       offsetof(struct bpf_reg_state, var_off) - sizeof(reg->type));

	___mark_reg_known(reg, imm);

}



static void __mark_reg32_known(struct bpf_reg_state *reg, u64 imm)

{

	reg->var_off = tnum_const_subreg(reg->var_off, imm);
@@ -7001,14 +7007,18 @@ static void reg_set_min_max(struct bpf_reg_state *true_reg, 
		struct bpf_reg_state *reg =

			opcode == BPF_JEQ ? true_reg : false_reg;



		/* For BPF_JEQ, if this is false we know nothing Jon Snow, but

		 * if it is true we know the value for sure. Likewise for

		 * BPF_JNE.

		/* JEQ/JNE comparison doesn't change the register equivalence.

		 * r1 = r2;

		 * if (r1 == 42) goto label;

		 * ...

		 * label: // here both r1 and r2 are known to be 42.

		 *

		 * Hence when marking register as known preserve it's ID.

		 */

		if (is_jmp32)

			__mark_reg32_known(reg, val32);

		else

			__mark_reg_known(reg, val);

			___mark_reg_known(reg, val);

		break;

	}

	case BPF_JSET:
@@ -7551,7 +7561,8 @@ static int check_cond_jmp_op(struct bpf_verifier_env *env, 
				reg_combine_min_max(&other_branch_regs[insn->src_reg],

						    &other_branch_regs[insn->dst_reg],

						    src_reg, dst_reg, opcode);

			if (src_reg->id) {

			if (src_reg->id &&

			    !WARN_ON_ONCE(src_reg->id != other_branch_regs[insn->src_reg].id)) {

				find_equal_scalars(this_branch, src_reg);

				find_equal_scalars(other_branch, &other_branch_regs[insn->src_reg]);

			}
@@ -7563,7 +7574,8 @@ static int check_cond_jmp_op(struct bpf_verifier_env *env, 
					opcode, is_jmp32);

	}



	if (dst_reg->type == SCALAR_VALUE && dst_reg->id) {

	if (dst_reg->type == SCALAR_VALUE && dst_reg->id &&

	    !WARN_ON_ONCE(dst_reg->id != other_branch_regs[insn->dst_reg].id)) {

		find_equal_scalars(this_branch, dst_reg);

		find_equal_scalars(other_branch, &other_branch_regs[insn->dst_reg]);

	}

net/core/sock_map.c

+17 −7
Original line number Diff line number Diff line
@@ -238,17 +238,18 @@ static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs, 
	int ret;



	skb_verdict = READ_ONCE(progs->skb_verdict);

	skb_parser = READ_ONCE(progs->skb_parser);

	if (skb_verdict) {

		skb_verdict = bpf_prog_inc_not_zero(skb_verdict);

		if (IS_ERR(skb_verdict))

			return PTR_ERR(skb_verdict);

	}



	skb_parser = READ_ONCE(progs->skb_parser);

	if (skb_parser) {

		skb_parser = bpf_prog_inc_not_zero(skb_parser);

		if (IS_ERR(skb_parser)) {

			bpf_prog_put(skb_verdict);

			return PTR_ERR(skb_parser);

			ret = PTR_ERR(skb_parser);

			goto out_put_skb_verdict;

		}

	}
@@ -257,7 +258,7 @@ static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs, 
		msg_parser = bpf_prog_inc_not_zero(msg_parser);

		if (IS_ERR(msg_parser)) {

			ret = PTR_ERR(msg_parser);

			goto out;

			goto out_put_skb_parser;

		}

	}
@@ -311,11 +312,12 @@ out_drop: 
out_progs:

	if (msg_parser)

		bpf_prog_put(msg_parser);

out:

	if (skb_verdict)

		bpf_prog_put(skb_verdict);

out_put_skb_parser:

	if (skb_parser)

		bpf_prog_put(skb_parser);

out_put_skb_verdict:

	if (skb_verdict)

		bpf_prog_put(skb_verdict);

	return ret;

}
@@ -745,6 +747,7 @@ static void *sock_map_seq_lookup_elem(struct sock_map_seq_info *info) 
}



static void *sock_map_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(rcu)

{

	struct sock_map_seq_info *info = seq->private;
@@ -757,6 +760,7 @@ static void *sock_map_seq_start(struct seq_file *seq, loff_t *pos) 
}



static void *sock_map_seq_next(struct seq_file *seq, void *v, loff_t *pos)

	__must_hold(rcu)

{

	struct sock_map_seq_info *info = seq->private;
@@ -767,6 +771,7 @@ static void *sock_map_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
}



static int sock_map_seq_show(struct seq_file *seq, void *v)

	__must_hold(rcu)

{

	struct sock_map_seq_info *info = seq->private;

	struct bpf_iter__sockmap ctx = {};
@@ -789,6 +794,7 @@ static int sock_map_seq_show(struct seq_file *seq, void *v) 
}



static void sock_map_seq_stop(struct seq_file *seq, void *v)

	__releases(rcu)

{

	if (!v)

		(void)sock_map_seq_show(seq, NULL);
@@ -1353,6 +1359,7 @@ static void *sock_hash_seq_find_next(struct sock_hash_seq_info *info, 
}



static void *sock_hash_seq_start(struct seq_file *seq, loff_t *pos)

	__acquires(rcu)

{

	struct sock_hash_seq_info *info = seq->private;
@@ -1365,6 +1372,7 @@ static void *sock_hash_seq_start(struct seq_file *seq, loff_t *pos) 
}



static void *sock_hash_seq_next(struct seq_file *seq, void *v, loff_t *pos)

	__must_hold(rcu)

{

	struct sock_hash_seq_info *info = seq->private;
@@ -1373,6 +1381,7 @@ static void *sock_hash_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
}



static int sock_hash_seq_show(struct seq_file *seq, void *v)

	__must_hold(rcu)

{

	struct sock_hash_seq_info *info = seq->private;

	struct bpf_iter__sockmap ctx = {};
@@ -1396,6 +1405,7 @@ static int sock_hash_seq_show(struct seq_file *seq, void *v) 
}



static void sock_hash_seq_stop(struct seq_file *seq, void *v)

	__releases(rcu)

{

	if (!v)

		(void)sock_hash_seq_show(seq, NULL);

tools/testing/selftests/bpf/prog_tests/tcp_hdr_options.c

+1 −25
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "test_tcp_hdr_options.skel.h"

#include "test_misc_tcp_hdr_options.skel.h"



#define LO_ADDR6 "::eB9F"

#define LO_ADDR6 "::1"

#define CG_NAME "/tcpbpf-hdr-opt-test"



struct bpf_test_option exp_passive_estab_in;
@@ -40,27 +40,6 @@ struct sk_fds { 
	int active_lport;

};



static int add_lo_addr(void)

{

	char ip_addr_cmd[256];

	int cmdlen;



	cmdlen = snprintf(ip_addr_cmd, sizeof(ip_addr_cmd),

			  "ip -6 addr add %s/128 dev lo scope host",

			  LO_ADDR6);



	if (CHECK(cmdlen >= sizeof(ip_addr_cmd), "compile ip cmd",

		  "failed to add host addr %s to lo. ip cmdlen is too long\n",

		  LO_ADDR6))

		return -1;



	if (CHECK(system(ip_addr_cmd), "run ip cmd",

		  "failed to add host addr %s to lo\n", LO_ADDR6))

		return -1;



	return 0;

}



static int create_netns(void)

{

	if (CHECK(unshare(CLONE_NEWNET), "create netns",
@@ -72,9 +51,6 @@ static int create_netns(void) 
		  "failed to bring lo link up\n"))

		return -1;



	if (add_lo_addr())

		return -1;



	return 0;

}

tools/testing/selftests/bpf/progs/test_misc_tcp_hdr_options.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#define BPF_PROG_TEST_TCP_HDR_OPTIONS

#include "test_tcp_hdr_options.h"



__u16 last_addr16_n = __bpf_htons(0xeB9F);

__u16 last_addr16_n = __bpf_htons(1);

__u16 active_lport_n = 0;

__u16 active_lport_h = 0;

__u16 passive_lport_n = 0;

tools/testing/selftests/bpf/verifier/regalloc.c

+26 −0
Original line number Diff line number Diff line
@@ -241,3 +241,29 @@ 
	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

{

	"regalloc, spill, JEQ",

	.insns = {

	BPF_MOV64_REG(BPF_REG_6, BPF_REG_1),

	BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),

	BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),

	BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),

	BPF_LD_MAP_FD(BPF_REG_1, 0),

	BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),

	BPF_STX_MEM(BPF_DW, BPF_REG_10, BPF_REG_0, -8), /* spill r0 */

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_0, 0, 0),

	/* The verifier will walk the rest twice with r0 == 0 and r0 == map_value */

	BPF_EMIT_CALL(BPF_FUNC_get_prandom_u32),

	BPF_MOV64_REG(BPF_REG_2, BPF_REG_0),

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_2, 20, 0),

	/* The verifier will walk the rest two more times with r0 == 20 and r0 == unknown */

	BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_10, -8), /* fill r3 with map_value */

	BPF_JMP_IMM(BPF_JEQ, BPF_REG_3, 0, 1), /* skip ldx if map_value == NULL */

	/* Buggy verifier will think that r3 == 20 here */

	BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_3, 0), /* read from map_value */

	BPF_EXIT_INSN(),

	},

	.fixup_map_hash_48b = { 4 },

	.result = ACCEPT,

	.prog_type = BPF_PROG_TYPE_TRACEPOINT,

},

CRA Git | Maintained and supported by SUSTech CRA and CCSE