diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-05-04 15:27:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-04 23:47:54 -0400 |
| commit | 777c6ae57ebd432b59950b3e28bf01676018d1b2 (patch) | |
| tree | daa9fc5647e16767136233e80544b785727f1271 | |
| parent | aa8a8b05adfc72e562abe7ae5c6933906e0ed2e9 (diff) | |
| download | op-kernel-dev-777c6ae57ebd432b59950b3e28bf01676018d1b2.zip op-kernel-dev-777c6ae57ebd432b59950b3e28bf01676018d1b2.tar.gz | |
tcp: two more missing bh disable
percpu_counter only have protection against preemption.
TCP stack uses them possibly from BH, so we need BH protection
in contexts that could be run in process context
Fixes: c10d9310edf5 ("tcp: do not assume TCP code is non preemptible")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 7ce112a..fa8c398 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -706,7 +706,9 @@ void inet_csk_destroy_sock(struct sock *sk) sk_refcnt_debug_release(sk); + local_bh_disable(); percpu_counter_dec(sk->sk_prot->orphan_count); + local_bh_enable(); sock_put(sk); } EXPORT_SYMBOL(inet_csk_destroy_sock); diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 761bc49..a7ab947 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1839,7 +1839,9 @@ void tcp_v4_destroy_sock(struct sock *sk) tcp_free_fastopen_req(tp); tcp_saved_syn_free(tp); + local_bh_disable(); sk_sockets_allocated_dec(sk); + local_bh_enable(); if (mem_cgroup_sockets_enabled && sk->sk_memcg) sock_release_memcg(sk); |
