Commit 820ed3fb authored Apr 02, 2018 by John Fastabend Committed by Daniel Borkmann Apr 04, 2018

bpf: sockmap, free memory on sock close with cork data



If a socket with pending cork data is closed we do not return the
memory to the socket until the garbage collector free's the psock
structure. The garbage collector though can run after the sock has
completed its close operation. If this ordering happens the sock code
will through a WARN_ON because there is still outstanding memory
accounted to the sock.

To resolve this ensure we return memory to the sock when a socket
is closed.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Fixes: 91843d54 ("bpf: sockmap, add msg_cork_bytes() helper")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent 4608f064

kernel/bpf/sockmap.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -211,6 +211,12 @@ static void bpf_tcp_close(struct sock *sk, long timeout)
		close_fun = psock->save_close;

		write_lock_bh(&sk->sk_callback_lock);
		if (psock->cork) {
		free_start_sg(psock->sock, psock->cork);
		kfree(psock->cork);
		psock->cork = NULL;
		}

		list_for_each_entry_safe(md, mtmp, &psock->ingress, list) {
		list_del(&md->list);
		free_start_sg(psock->sock, md);

Admin message