diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2015-12-04 20:14:04 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-05 19:57:50 +0300 |
| commit | b090e587cf43ea57d21ab91535e1ff070aaa1cea (patch) | |
| tree | 5d90543ea714c1e061f2a57c4fa46413b5ed32dc /include/net | |
| parent | b79759978ed04ed1c4887826b43a653da35f32b8 (diff) | |
| download | linux-b090e587cf43ea57d21ab91535e1ff070aaa1cea.tar.xz | |
sctp: update the netstamp_needed counter when copying sockets
[ Upstream commit 01ce63c90170283a9855d1db4fe81934dddce648 ]
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 4f355e69e5d2..4d631bd6fd16 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -683,6 +683,8 @@ enum sock_flags { SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ }; +#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)) + static inline void sock_copy_flags(struct sock *nsk, struct sock *osk) { nsk->sk_flags = osk->sk_flags; |