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

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



Daniel Borkmann says:

====================
pull-request: bpf 2018-11-01

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Fix tcp_bpf_recvmsg() to return -EAGAIN instead of 0 in non-blocking
   case when no data is available yet, from John.

2) Fix a compilation error in libbpf_attach_type_by_name() when compiled
   with clang 3.8, from Andrey.

3) Fix a partial copy of map pointer on scalar alu and remove id
   generation for RET_PTR_TO_MAP_VALUE return types, from Daniel.

4) Add unlimited memlock limit for kernel selftest's flow_dissector_load
   program, from Yonghong.

5) Fix ping for some BPF shell based kselftests where distro does not
   ship "ping -6" anymore, from Li.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e2acdddd dfeb8f4c

include/linux/bpf_verifier.h

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ struct bpf_reg_state { 
		 *   PTR_TO_MAP_VALUE_OR_NULL

		 */

		struct bpf_map *map_ptr;



		/* Max size from any of the above. */

		unsigned long raw;

	};

	/* Fixed part of pointer offset, pointer types only */

	s32 off;

kernel/bpf/verifier.c

+12 −9
Original line number Diff line number Diff line
@@ -2852,10 +2852,6 @@ static int check_helper_call(struct bpf_verifier_env *env, int func_id, int insn 
		regs[BPF_REG_0].type = NOT_INIT;

	} else if (fn->ret_type == RET_PTR_TO_MAP_VALUE_OR_NULL ||

		   fn->ret_type == RET_PTR_TO_MAP_VALUE) {

		if (fn->ret_type == RET_PTR_TO_MAP_VALUE)

			regs[BPF_REG_0].type = PTR_TO_MAP_VALUE;

		else

			regs[BPF_REG_0].type = PTR_TO_MAP_VALUE_OR_NULL;

		/* There is no offset yet applied, variable or fixed */

		mark_reg_known_zero(env, regs, BPF_REG_0);

		/* remember map_ptr, so that check_map_access()
@@ -2868,7 +2864,12 @@ static int check_helper_call(struct bpf_verifier_env *env, int func_id, int insn 
			return -EINVAL;

		}

		regs[BPF_REG_0].map_ptr = meta.map_ptr;

		if (fn->ret_type == RET_PTR_TO_MAP_VALUE) {

			regs[BPF_REG_0].type = PTR_TO_MAP_VALUE;

		} else {

			regs[BPF_REG_0].type = PTR_TO_MAP_VALUE_OR_NULL;

			regs[BPF_REG_0].id = ++env->id_gen;

		}

	} else if (fn->ret_type == RET_PTR_TO_SOCKET_OR_NULL) {

		int id = acquire_reference_state(env, insn_idx);

		if (id < 0)
@@ -3046,7 +3047,7 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env, 
			dst_reg->umax_value = umax_ptr;

			dst_reg->var_off = ptr_reg->var_off;

			dst_reg->off = ptr_reg->off + smin_val;

			dst_reg->range = ptr_reg->range;

			dst_reg->raw = ptr_reg->raw;

			break;

		}

		/* A new variable offset is created.  Note that off_reg->off
@@ -3076,10 +3077,11 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env, 
		}

		dst_reg->var_off = tnum_add(ptr_reg->var_off, off_reg->var_off);

		dst_reg->off = ptr_reg->off;

		dst_reg->raw = ptr_reg->raw;

		if (reg_is_pkt_pointer(ptr_reg)) {

			dst_reg->id = ++env->id_gen;

			/* something was added to pkt_ptr, set range to zero */

			dst_reg->range = 0;

			dst_reg->raw = 0;

		}

		break;

	case BPF_SUB:
@@ -3108,7 +3110,7 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env, 
			dst_reg->var_off = ptr_reg->var_off;

			dst_reg->id = ptr_reg->id;

			dst_reg->off = ptr_reg->off - smin_val;

			dst_reg->range = ptr_reg->range;

			dst_reg->raw = ptr_reg->raw;

			break;

		}

		/* A new variable offset is created.  If the subtrahend is known
@@ -3134,11 +3136,12 @@ static int adjust_ptr_min_max_vals(struct bpf_verifier_env *env, 
		}

		dst_reg->var_off = tnum_sub(ptr_reg->var_off, off_reg->var_off);

		dst_reg->off = ptr_reg->off;

		dst_reg->raw = ptr_reg->raw;

		if (reg_is_pkt_pointer(ptr_reg)) {

			dst_reg->id = ++env->id_gen;

			/* something was added to pkt_ptr, set range to zero */

			if (smin_val < 0)

				dst_reg->range = 0;

				dst_reg->raw = 0;

		}

		break;

	case BPF_AND:

net/ipv4/tcp_bpf.c

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ msg_bytes_ready: 
			ret = err;

			goto out;

		}

		copied = -EAGAIN;

	}

	ret = copied;

out:

tools/lib/bpf/libbpf.c

+7 −6
Original line number Diff line number Diff line
@@ -2084,19 +2084,19 @@ void bpf_program__set_expected_attach_type(struct bpf_program *prog, 
	prog->expected_attach_type = type;

}



#define BPF_PROG_SEC_IMPL(string, ptype, eatype, atype) \

	{ string, sizeof(string) - 1, ptype, eatype, atype }

#define BPF_PROG_SEC_IMPL(string, ptype, eatype, is_attachable, atype) \

	{ string, sizeof(string) - 1, ptype, eatype, is_attachable, atype }



/* Programs that can NOT be attached. */

#define BPF_PROG_SEC(string, ptype) BPF_PROG_SEC_IMPL(string, ptype, 0, -EINVAL)

#define BPF_PROG_SEC(string, ptype) BPF_PROG_SEC_IMPL(string, ptype, 0, 0, 0)



/* Programs that can be attached. */

#define BPF_APROG_SEC(string, ptype, atype) \

	BPF_PROG_SEC_IMPL(string, ptype, 0, atype)

	BPF_PROG_SEC_IMPL(string, ptype, 0, 1, atype)



/* Programs that must specify expected attach type at load time. */

#define BPF_EAPROG_SEC(string, ptype, eatype) \

	BPF_PROG_SEC_IMPL(string, ptype, eatype, eatype)

	BPF_PROG_SEC_IMPL(string, ptype, eatype, 1, eatype)



/* Programs that can be attached but attach type can't be identified by section

 * name. Kept for backward compatibility.
@@ -2108,6 +2108,7 @@ static const struct { 
	size_t len;

	enum bpf_prog_type prog_type;

	enum bpf_attach_type expected_attach_type;

	int is_attachable;

	enum bpf_attach_type attach_type;

} section_names[] = {

	BPF_PROG_SEC("socket",			BPF_PROG_TYPE_SOCKET_FILTER),
@@ -2198,7 +2199,7 @@ int libbpf_attach_type_by_name(const char *name, 
	for (i = 0; i < ARRAY_SIZE(section_names); i++) {

		if (strncmp(name, section_names[i].sec, section_names[i].len))

			continue;

		if (section_names[i].attach_type == -EINVAL)

		if (!section_names[i].is_attachable)

			return -EINVAL;

		*attach_type = section_names[i].attach_type;

		return 0;

tools/testing/selftests/bpf/flow_dissector_load.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <bpf/bpf.h>

#include <bpf/libbpf.h>



#include "bpf_rlimit.h"



const char *cfg_pin_path = "/sys/fs/bpf/flow_dissector";

const char *cfg_map_name = "jmp_table";

bool cfg_attach = true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE