shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

net: fix socket refcounting in skb_complete_tx_timestamp()

Browse Source 
[ Upstream commit 9ac25fc063 ]

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: 62bccb8cdb ("net-timestamp: Make the clone operation stand-alone from phy timestamping")
Signed-off-by: Eric 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: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eric Dumazet
2017-03-03 21:01:03 -08:00
committed by Greg Kroah-Hartman
parent 98fa3d2a8e
commit f157cc1d72
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/core/skbuff.c
View File

@@ -3814,13 +3814,14 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
if (!skb_may_tx_timestamp(sk, false)) if (!skb_may_tx_timestamp(sk, false))
return; return;
/* 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);