net: properly release sk_frag.page
I mistakenly added the code to release sk->sk_frag in
sk_common_release() instead of sk_destruct()
TCP sockets using sk->sk_allocation == GFP_ATOMIC do no call
sk_common_release() at close time, thus leaking one (order-3) page.
iSCSI is using such sockets.
Fixes: 5640f76858
("net: use a per task frag allocator")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
622c36f143
commit
22a0e18eac
|
@ -1442,6 +1442,11 @@ static void __sk_destruct(struct rcu_head *head)
|
||||||
pr_debug("%s: optmem leakage (%d bytes) detected\n",
|
pr_debug("%s: optmem leakage (%d bytes) detected\n",
|
||||||
__func__, atomic_read(&sk->sk_omem_alloc));
|
__func__, atomic_read(&sk->sk_omem_alloc));
|
||||||
|
|
||||||
|
if (sk->sk_frag.page) {
|
||||||
|
put_page(sk->sk_frag.page);
|
||||||
|
sk->sk_frag.page = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
if (sk->sk_peer_cred)
|
if (sk->sk_peer_cred)
|
||||||
put_cred(sk->sk_peer_cred);
|
put_cred(sk->sk_peer_cred);
|
||||||
put_pid(sk->sk_peer_pid);
|
put_pid(sk->sk_peer_pid);
|
||||||
|
@ -2787,11 +2792,6 @@ void sk_common_release(struct sock *sk)
|
||||||
|
|
||||||
sk_refcnt_debug_release(sk);
|
sk_refcnt_debug_release(sk);
|
||||||
|
|
||||||
if (sk->sk_frag.page) {
|
|
||||||
put_page(sk->sk_frag.page);
|
|
||||||
sk->sk_frag.page = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
sock_put(sk);
|
sock_put(sk);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sk_common_release);
|
EXPORT_SYMBOL(sk_common_release);
|
||||||
|
|
Loading…
Reference in New Issue