diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-25 17:35:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-25 17:35:03 -0700 |
| commit | 28ba934d28cf46c1ea92f6aff28e8d9ec52e194e (patch) | |
| tree | 821fd2b12068195842b6d95acf3c5eaac605fcd3 /include/linux/skmsg.h | |
| parent | 47d858d0bdcd47cc1c6c9eeca91b091dd9e55637 (diff) | |
| parent | cb8ffde5694ae5fffb456eae932aac442aa3a207 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-07-25
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) fix segfault in libbpf, from Andrii.
2) fix gso_segs access, from Eric.
3) tls/sockmap fixes, from Jakub and John.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skmsg.h')
| -rw-r--r-- | include/linux/skmsg.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h index 50ced8aba9db..e4b3fb4bb77c 100644 --- a/include/linux/skmsg.h +++ b/include/linux/skmsg.h @@ -354,7 +354,13 @@ static inline void sk_psock_restore_proto(struct sock *sk, sk->sk_write_space = psock->saved_write_space; if (psock->sk_proto) { - sk->sk_prot = psock->sk_proto; + struct inet_connection_sock *icsk = inet_csk(sk); + bool has_ulp = !!icsk->icsk_ulp_data; + + if (has_ulp) + tcp_update_ulp(sk, psock->sk_proto); + else + sk->sk_prot = psock->sk_proto; psock->sk_proto = NULL; } } |