diff options
| author |   Eric Dumazet <edumazet@google.com> | 2015-10-09 15:42:21 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-12 19:45:48 -0700 |
| commit | 5fcd2d8be43664f1b6a5add3d21a367411add9d4 (patch) | |
| tree | 3cc46ec8ea75d7ddfed640d2be9b33f1aa80fce7 /drivers/net/tun.c | |
| parent | Merge branch 'netns-defrag' (diff) | |
| download | linux-dev-5fcd2d8be43664f1b6a5add3d21a367411add9d4.tar.xz linux-dev-5fcd2d8be43664f1b6a5add3d21a367411add9d4.zip | |
tun: use sk_fullsock() before reading sk->sk_tsflags
timewait or request sockets are small and do not contain sk->sk_tsflags
Without this fix, we might read garbage, and crash later in
__skb_complete_tx_timestamp()
-> sock_queue_err_skb()
(These pseudo sockets do not have an error queue either)
Fixes: ca6fb0651883 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 976aa9704297..b1878faea397 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -858,7 +858,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC))) goto drop; - if (skb->sk) { + if (skb->sk && sk_fullsock(skb->sk)) { sock_tx_timestamp(skb->sk, &skb_shinfo(skb)->tx_flags); sw_tx_timestamp(skb); } |