Commit c3ad3eca 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 2019-03-09

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

The main changes are:

1) Fix a crash in AF_XDP's xsk_diag_put_ring() which was passing
   wrong queue argument, from Eric.

2) Fix a regression due to wrong test for TCP GSO packets used in
   various BPF helpers like NAT64, from Willem.

3) Fix a sk_msg strparser warning which asserts that strparser must
   be stopped first, from Jakub.

4) Fix rejection of invalid options/bind flags in AF_XDP, from Björn.

5) Fix GSO in bpf_lwt_push_ip_encap() which must properly set inner
   headers and inner protocol, from Peter.

6) Fix a libbpf leak when kernel does not support BTF, from Nikita.

7) Various BPF selftest and libbpf build fixes to make out-of-tree
   compilation work and to properly resolve dependencies via fixdep
   target, from Stanislav.

8) Fix rejection of invalid ldimm64 imm field, from Daniel.

9) Fix bpf stats sysctl compile warning of unused helper function
   proc_dointvec_minmax_bpf_stats() under some configs, from Arnd.

10) Fix couple of warnings about using plain integer as NULL, from Bo.

11) Fix some BPF sample spelling mistakes, from Colin.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9d3e1368 71b91a50

include/linux/bpf-cgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static inline int bpf_cgroup_storage_assign(struct bpf_prog *prog, 
static inline void bpf_cgroup_storage_release(struct bpf_prog *prog,

					      struct bpf_map *map) {}

static inline struct bpf_cgroup_storage *bpf_cgroup_storage_alloc(

	struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return 0; }

	struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return NULL; }

static inline void bpf_cgroup_storage_free(

	struct bpf_cgroup_storage *storage) {}

static inline int bpf_percpu_cgroup_storage_copy(struct bpf_map *map, void *key,

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -4286,10 +4286,10 @@ static inline bool skb_is_gso_sctp(const struct sk_buff *skb) 
	return skb_shinfo(skb)->gso_type & SKB_GSO_SCTP;

}



/* Note: Should be called only if skb_is_gso(skb) is true */

static inline bool skb_is_gso_tcp(const struct sk_buff *skb)

{

	return skb_is_gso(skb) &&

	       skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6);

	return skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6);

}



static inline void skb_gso_reset(struct sk_buff *skb)

kernel/bpf/verifier.c

+5 −5
Original line number Diff line number Diff line
@@ -6678,17 +6678,17 @@ static int replace_map_fd_with_map_ptr(struct bpf_verifier_env *env) 
				/* valid generic load 64-bit imm */

				goto next_insn;



			if (insn->src_reg != BPF_PSEUDO_MAP_FD) {

				verbose(env,

					"unrecognized bpf_ld_imm64 insn\n");

			if (insn[0].src_reg != BPF_PSEUDO_MAP_FD ||

			    insn[1].imm != 0) {

				verbose(env, "unrecognized bpf_ld_imm64 insn\n");

				return -EINVAL;

			}



			f = fdget(insn->imm);

			f = fdget(insn[0].imm);

			map = __bpf_map_get(f);

			if (IS_ERR(map)) {

				verbose(env, "fd %d is not pointing to valid bpf_map\n",

					insn->imm);

					insn[0].imm);

				return PTR_ERR(map);

			}

kernel/sysctl.c

+1 −1
Original line number Diff line number Diff line
@@ -3274,7 +3274,7 @@ int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write, 


#endif /* CONFIG_PROC_SYSCTL */



#ifdef CONFIG_BPF_SYSCALL

#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL)

static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,

					  void __user *buffer, size_t *lenp,

					  loff_t *ppos)

net/bpf/test_run.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
static int bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat,

			u32 *retval, u32 *time)

{

	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { 0 };

	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { NULL };

	enum bpf_cgroup_storage_type stype;

	u64 time_start, time_spent = 0;

	int ret = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE