leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sock: free skb in skb_complete_tx_timestamp on error

Browse Source 
skb_complete_tx_timestamp must ingest the skb it is passed. Call
kfree_skb if the skb cannot be enqueued.

Fixes: b245be1f4d ("net-timestamp: no-payload only sysctl")
Fixes: 9ac25fc063 ("net: fix socket refcounting in skb_complete_tx_timestamp()")
Reported-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Willem de Bruijn 2017-12-13 14:41:06 -05:00 committed by David S. Miller
parent d9356edc44
commit 35b99dffc3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/skbuff.c
View File

@ -4293,7 +4293,7 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
struct sock *sk = skb->sk; struct sock *sk = skb->sk;
if (!skb_may_tx_timestamp(sk, false)) if (!skb_may_tx_timestamp(sk, false))
return; goto err;
/* Take a reference to prevent skb_orphan() from freeing the socket, /* Take a reference to prevent skb_orphan() from freeing the socket,
* but only if the socket refcount is not zero. * but only if the socket refcount is not zero.
@ -4302,7 +4302,11 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
*skb_hwtstamps(skb) = *hwtstamps; *skb_hwtstamps(skb) = *hwtstamps;
__skb_complete_tx_timestamp(skb, sk, SCM_TSTAMP_SND, false); __skb_complete_tx_timestamp(skb, sk, SCM_TSTAMP_SND, false);
sock_put(sk); sock_put(sk);
return;
} }
err:
kfree_skb(skb);
} }
EXPORT_SYMBOL_GPL(skb_complete_tx_timestamp); EXPORT_SYMBOL_GPL(skb_complete_tx_timestamp);