Commit 271b955e 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-07-01

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

The main changes are:

1) A bpf_fib_lookup() helper fix to change the API before freeze to
   return an encoding of the FIB lookup result and return the nexthop
   device index in the params struct (instead of device index as return
   code that we had before), from David.

2) Various BPF JIT fixes to address syzkaller fallout, that is, do not
   reject progs when set_memory_*() fails since it could still be RO.
   Also arm32 JIT was not using bpf_jit_binary_lock_ro() API which was
   an issue, and a memory leak in s390 JIT found during review, from
   Daniel.

3) Multiple fixes for sockmap/hash to address most of the syzkaller
   triggered bugs. Usage with IPv6 was crashing, a GPF in bpf_tcp_close(),
   a missing sock_map_release() routine to hook up to callbacks, and a
   fix for an omitted bucket lock in sock_close(), from John.

4) Two bpftool fixes to remove duplicated error message on program load,
   and another one to close the libbpf object after program load. One
   additional fix for nfp driver's BPF offload to avoid stopping offload
   completely if replace of program failed, from Jakub.

5) Couple of BPF selftest fixes that bail out in some of the test
   scripts if the user does not have the right privileges, from Jeffrin.

6) Fixes in test_bpf for s390 when CONFIG_BPF_JIT_ALWAYS_ON is set
   where we need to set the flag that some of the test cases are expected
   to fail, from Kleber.

7) Fix to detangle BPF_LIRC_MODE2 dependency from CONFIG_CGROUP_BPF
   since it has no relation to it and lirc2 users often have configs
   without cgroups enabled and thus would not be able to use it, from Sean.

8) Fix a selftest failure in sockmap by removing a useless setrlimit()
   call that would set a too low limit where at the same time we are
   already including bpf_rlimit.h that does the job, from Yonghong.

9) Fix BPF selftest config with missing missing NET_SCHED, from Anders.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 35e8c7ba bf2b866a

arch/arm/net/bpf_jit_32.c

+1 −1
Original line number Diff line number Diff line
@@ -1844,7 +1844,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
		/* there are 2 passes here */

		bpf_jit_dump(prog->len, image_size, 2, ctx.target);



	set_memory_ro((unsigned long)header, header->pages);

	bpf_jit_binary_lock_ro(header);

	prog->bpf_func = (void *)ctx.target;

	prog->jited = 1;

	prog->jited_len = image_size;

arch/s390/net/bpf_jit_comp.c

+1 −0
Original line number Diff line number Diff line
@@ -1286,6 +1286,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) 
		goto free_addrs;

	}

	if (bpf_jit_prog(&jit, fp)) {

		bpf_jit_binary_free(header);

		fp = orig_fp;

		goto free_addrs;

	}

drivers/media/rc/bpf-lirc.c

+2 −12
Original line number Diff line number Diff line
@@ -207,29 +207,19 @@ void lirc_bpf_free(struct rc_dev *rcdev) 
	bpf_prog_array_free(rcdev->raw->progs);

}



int lirc_prog_attach(const union bpf_attr *attr)

int lirc_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog)

{

	struct bpf_prog *prog;

	struct rc_dev *rcdev;

	int ret;



	if (attr->attach_flags)

		return -EINVAL;



	prog = bpf_prog_get_type(attr->attach_bpf_fd,

				 BPF_PROG_TYPE_LIRC_MODE2);

	if (IS_ERR(prog))

		return PTR_ERR(prog);



	rcdev = rc_dev_get_from_fd(attr->target_fd);

	if (IS_ERR(rcdev)) {

		bpf_prog_put(prog);

	if (IS_ERR(rcdev))

		return PTR_ERR(rcdev);

	}



	ret = lirc_bpf_attach(rcdev, prog);

	if (ret)

		bpf_prog_put(prog);



	put_device(&rcdev->dev);

drivers/net/ethernet/netronome/nfp/bpf/main.c

+3 −3
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ nfp_bpf_xdp_offload(struct nfp_app *app, struct nfp_net *nn, 


	ret = nfp_net_bpf_offload(nn, prog, running, extack);

	/* Stop offload if replace not possible */

	if (ret && prog)

		nfp_bpf_xdp_offload(app, nn, NULL, extack);

	if (ret)

		return ret;



	nn->dp.bpf_offload_xdp = prog && !ret;

	nn->dp.bpf_offload_xdp = !!prog;

	return ret;

}

include/linux/bpf-cgroup.h

+26 −0
Original line number Diff line number Diff line
@@ -188,12 +188,38 @@ int __cgroup_bpf_check_dev_permission(short dev_type, u32 major, u32 minor, 
									      \

	__ret;								      \

})

int cgroup_bpf_prog_attach(const union bpf_attr *attr,

			   enum bpf_prog_type ptype, struct bpf_prog *prog);

int cgroup_bpf_prog_detach(const union bpf_attr *attr,

			   enum bpf_prog_type ptype);

int cgroup_bpf_prog_query(const union bpf_attr *attr,

			  union bpf_attr __user *uattr);

#else



struct bpf_prog;

struct cgroup_bpf {};

static inline void cgroup_bpf_put(struct cgroup *cgrp) {}

static inline int cgroup_bpf_inherit(struct cgroup *cgrp) { return 0; }



static inline int cgroup_bpf_prog_attach(const union bpf_attr *attr,

					 enum bpf_prog_type ptype,

					 struct bpf_prog *prog)

{

	return -EINVAL;

}



static inline int cgroup_bpf_prog_detach(const union bpf_attr *attr,

					 enum bpf_prog_type ptype)

{

	return -EINVAL;

}



static inline int cgroup_bpf_prog_query(const union bpf_attr *attr,

					union bpf_attr __user *uattr)

{

	return -EINVAL;

}



#define cgroup_bpf_enabled (0)

#define BPF_CGROUP_PRE_CONNECT_ENABLED(sk) (0)

#define BPF_CGROUP_RUN_PROG_INET_INGRESS(sk,skb) ({ 0; })

CRA Git | Maintained and supported by SUSTech CRA and CCSE