Commit 01ce63c9 authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller
Browse files

sctp: update the netstamp_needed counter when copying sockets

Dmitry Vyukov reported that SCTP was triggering a WARN on socket destroy
related to disabling sock timestamp.

When SCTP accepts an association or peel one off, it copies sock flags
but forgot to call net_enable_timestamp() if a packet timestamping flag
was copied, leading to extra calls to net_disable_timestamp() whenever
such clones were closed.

The fix is to call net_enable_timestamp() whenever we copy a sock with
that flag on, like tcp does.

Reported-by: default avatarDmitry Vyukov <>
Signed-off-by: default avatarMarcelo Ricardo Leitner <>
Acked-by: default avatarVlad Yasevich <>
Signed-off-by: default avatarDavid S. Miller <>
parent cb5e173e
......@@ -740,6 +740,8 @@ enum sock_flags {
SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */
static inline void sock_copy_flags(struct sock *nsk, struct sock *osk)
nsk->sk_flags = osk->sk_flags;
......@@ -433,8 +433,6 @@ static bool sock_needs_netstamp(const struct sock *sk)
static void sock_disable_timestamp(struct sock *sk, unsigned long flags)
if (sk->sk_flags & flags) {
......@@ -7199,6 +7199,9 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk,
newinet->mc_ttl = 1;
newinet->mc_index = 0;
newinet->mc_list = NULL;
if (newsk->sk_flags & SK_FLAGS_TIMESTAMP)
static inline void sctp_copy_descendant(struct sock *sk_to,
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment