Commit 61cc261b authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman

net: fix socket refcounting in skb_complete_tx_timestamp()

commit 9ac25fc0 upstream.

TX skbs do not necessarily hold a reference on skb->sk->sk_refcnt
By the time TX completion happens, sk_refcnt might be already 0.

sock_hold()/sock_put() would then corrupt critical state, like
sk_wmem_alloc and lead to leaks or use after free.

Fixes: 62bccb8c ("net-timestamp: Make the clone operation stand-alone from phy timestamping")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Soheil Hassas Yeganeh <soheil@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66aebd46
...@@ -3617,13 +3617,14 @@ void skb_complete_tx_timestamp(struct sk_buff *skb, ...@@ -3617,13 +3617,14 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
{ {
struct sock *sk = skb->sk; struct sock *sk = skb->sk;
/* take a reference to prevent skb_orphan() from freeing the socket */ /* Take a reference to prevent skb_orphan() from freeing the socket,
sock_hold(sk); * but only if the socket refcount is not zero.
*/
*skb_hwtstamps(skb) = *hwtstamps; if (likely(atomic_inc_not_zero(&sk->sk_refcnt))) {
__skb_complete_tx_timestamp(skb, sk, SCM_TSTAMP_SND); *skb_hwtstamps(skb) = *hwtstamps;
__skb_complete_tx_timestamp(skb, sk, SCM_TSTAMP_SND);
sock_put(sk); sock_put(sk);
}
} }
EXPORT_SYMBOL_GPL(skb_complete_tx_timestamp); EXPORT_SYMBOL_GPL(skb_complete_tx_timestamp);
......
Markdown is supported
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