Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a0e18e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: 5640f768 ("net: use a per task frag allocator")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 622c36f1

net/core/sock.c

+5 −5
Original line number Diff line number Diff line
@@ -1442,6 +1442,11 @@ static void __sk_destruct(struct rcu_head *head) 
		pr_debug("%s: optmem leakage (%d bytes) detected\n",

			 __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)

		put_cred(sk->sk_peer_cred);

	put_pid(sk->sk_peer_pid);
@@ -2787,11 +2792,6 @@ void sk_common_release(struct sock *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);

}

EXPORT_SYMBOL(sk_common_release);