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

Commit 704da560 authored by Octavian Purdila's avatar Octavian Purdila Committed by David S. Miller
Browse files

tcp: update the netstamp_needed counter when cloning sockets 



This fixes a netstamp_needed accounting issue when the listen socket
has SO_TIMESTAMP set:

    s = socket(AF_INET, SOCK_STREAM, 0);
    setsockopt(s, SOL_SOCKET, SO_TIMESTAMP, 1); -> netstamp_needed = 1
    bind(s, ...);
    listen(s, ...);
    s2 = accept(s, ...); -> netstamp_needed = 1
    close(s2); -> netstamp_needed = 0
    close(s); -> netstamp_needed = -1

Signed-off-by: default avatarOctavian Purdila <opurdila@ixiacom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ca518b6

net/core/sock.c

+4 −0
Original line number Diff line number Diff line
@@ -1205,6 +1205,10 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority) 


		if (newsk->sk_prot->sockets_allocated)

			percpu_counter_inc(newsk->sk_prot->sockets_allocated);



		if (sock_flag(newsk, SOCK_TIMESTAMP) ||

		    sock_flag(newsk, SOCK_TIMESTAMPING_RX_SOFTWARE))

			net_enable_timestamp();

	}

out:

	return newsk;