Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / net / core / timestamping.c

diff --git a/net/core/timestamping.c b/net/core/timestamping.c
index 98a5264..82fb288 100644 (file)
--- a/net/core/timestamping.c
+++ b/net/core/timestamping.c
@@ -57,9 +57,13 @@ void skb_clone_tx_timestamp(struct sk_buff *skb)
        case PTP_CLASS_V2_VLAN:
                phydev = skb->dev->phydev;
                if (likely(phydev->drv->txtstamp)) {
+                       if (!atomic_inc_not_zero(&sk->sk_refcnt))
+                               return;
                        clone = skb_clone(skb, GFP_ATOMIC);
-                       if (!clone)
+                       if (!clone) {
+                               sock_put(sk);
                                return;
+                       }
                        clone->sk = sk;
                        phydev->drv->txtstamp(phydev, clone, type);
                }
@@ -77,8 +81,11 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
        struct sock_exterr_skb *serr;
        int err;
 
-       if (!hwtstamps)
+       if (!hwtstamps) {
+               sock_put(sk);
+               kfree_skb(skb);
                return;
+       }
 
        *skb_hwtstamps(skb) = *hwtstamps;
        serr = SKB_EXT_ERR(skb);
@@ -87,6 +94,7 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
        serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
        skb->sk = NULL;
        err = sock_queue_err_skb(sk, skb);
+       sock_put(sk);
        if (err)
                kfree_skb(skb);
 }