From: David S. Miller <davem@davemloft.net>
Date: Fri, 25 May 2018 02:20:51 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=90fed9c94625718a3a10db7d1e8e4efe093bbf5f;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

====================
pull-request: bpf-next 2018-05-24

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

The main changes are:

1) Björn Töpel cleans up AF_XDP (removes rebind, explicit cache alignment from uapi, etc).

2) David Ahern adds mtu checks to bpf_ipv{4,6}_fib_lookup() helpers.

3) Jesper Dangaard Brouer adds bulking support to ndo_xdp_xmit.

4) Jiong Wang adds support for indirect and arithmetic shifts to NFP

5) Martin KaFai Lau cleans up BTF uapi and makes the btf_header extensible.

6) Mathieu Xhonneux adds an End.BPF action to seg6local with BPF helpers allowing
   to edit/grow/shrink a SRH and apply on a packet generic SRv6 actions.

7) Sandipan Das adds support for bpf2bpf function calls in ppc64 JIT.

8) Yonghong Song adds BPF_TASK_FD_QUERY command for introspection of tracing events.

9) other misc fixes from Gustavo A. R. Silva, Sirio Balmelli, John Fastabend, and Magnus Karlsson
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

90fed9c94625718a3a10db7d1e8e4efe093bbf5f
diff --cc kernel/bpf/sockmap.c
index cd832250a478,3b28955a6383..52a91d816c0e
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@@ -1823,13 -1824,12 +1824,12 @@@ static int __sock_map_ctx_update_elem(s
  	write_unlock_bh(&sock->sk_callback_lock);
  	return err;
  out_free:
- 	kfree(e);
  	smap_release_sock(psock, sock);
  out_progs:
 -	if (verdict)
 -		bpf_prog_put(verdict);
 -	if (parse)
 +	if (parse && verdict) {
  		bpf_prog_put(parse);
 +		bpf_prog_put(verdict);
 +	}
  	if (tx_msg)
  		bpf_prog_put(tx_msg);
  	write_unlock_bh(&sock->sk_callback_lock);