diff options
| author | David S. Miller | 2019-06-16 03:19:47 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-06-16 03:19:47 +0200 |
| commit | 1eb4169c1e6b3c95f3a99c2c7f91b10e6c98e848 (patch) | |
| tree | bc9dd11610389aadebdc4e016d5035dff7aefaeb /net/core/sock.c | |
| parent | Revert "net: phylink: set the autoneg state in phylink_phy_change" (diff) | |
| parent | bpf: fix nested bpf tracepoints with per-cpu data (diff) | |
| download | kernel-qcow2-linux-1eb4169c1e6b3c95f3a99c2c7f91b10e6c98e848.tar.gz kernel-qcow2-linux-1eb4169c1e6b3c95f3a99c2c7f91b10e6c98e848.tar.xz kernel-qcow2-linux-1eb4169c1e6b3c95f3a99c2c7f91b10e6c98e848.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-06-15
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) fix stack layout of JITed x64 bpf code, from Alexei.
2) fix out of bounds memory access in bpf_sk_storage, from Arthur.
3) fix lpm trie walk, from Jonathan.
4) fix nested bpf_perf_event_output, from Matt.
5) and several other fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 7f49392579a5..af09a23e4822 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1850,6 +1850,9 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) goto out; } RCU_INIT_POINTER(newsk->sk_reuseport_cb, NULL); +#ifdef CONFIG_BPF_SYSCALL + RCU_INIT_POINTER(newsk->sk_bpf_storage, NULL); +#endif newsk->sk_err = 0; newsk->sk_err_soft = 0; |