diff options
| author | Soheil Hassas Yeganeh <soheil@google.com> | 2017-03-18 17:03:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-21 18:44:17 -0700 |
| commit | 4ef1b2869447411ad3ef91ad7d4891a83c1a509a (patch) | |
| tree | b9dc299784a3231231e21cf46df312b6b1c40c9d /net/socket.c | |
| parent | 8605330aac5a5785630aec8f64378a54891937cc (diff) | |
| download | op-kernel-dev-4ef1b2869447411ad3ef91ad7d4891a83c1a509a.zip op-kernel-dev-4ef1b2869447411ad3ef91ad7d4891a83c1a509a.tar.gz | |
tcp: mark skbs with SCM_TIMESTAMPING_OPT_STATS
SOF_TIMESTAMPING_OPT_STATS can be enabled and disabled
while packets are collected on the error queue.
So, checking SOF_TIMESTAMPING_OPT_STATS in sk->sk_tsflags
is not enough to safely assume that the skb contains
OPT_STATS data.
Add a bit in sock_exterr_skb to indicate whether the
skb contains opt_stats data.
Fixes: 1c885808e456 ("tcp: SOF_TIMESTAMPING_OPT_STATS option for SO_TIMESTAMPING")
Reported-by: JongHwan Kim <zzoru007@gmail.com>
Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 692d698..985ef06 100644 --- a/net/socket.c +++ b/net/socket.c @@ -706,7 +706,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk, SCM_TIMESTAMPING, sizeof(tss), &tss); if (skb_is_err_queue(skb) && skb->len && - (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_STATS)) + SKB_EXT_ERR(skb)->opt_stats) put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_OPT_STATS, skb->len, skb->data); } |
