diff options
| author | Marcelo Ricardo Leitner | 2015-12-04 18:14:04 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-12-06 04:23:22 +0100 |
| commit | 01ce63c90170283a9855d1db4fe81934dddce648 (patch) | |
| tree | eab8388f522d7f71c2e96b343370ac50f6ff64d8 /net/core/sock.c | |
| parent | sctp: use the same clock as if sock source timestamps were on (diff) | |
| download | kernel-qcow2-linux-01ce63c90170283a9855d1db4fe81934dddce648.tar.gz kernel-qcow2-linux-01ce63c90170283a9855d1db4fe81934dddce648.tar.xz kernel-qcow2-linux-01ce63c90170283a9855d1db4fe81934dddce648.zip | |
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: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index e31dfcee1729..d01c8f42dbb2 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -433,8 +433,6 @@ static bool sock_needs_netstamp(const struct sock *sk) } } -#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)) - static void sock_disable_timestamp(struct sock *sk, unsigned long flags) { if (sk->sk_flags & flags) { |