Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes

3 files changed, 12 insertions, 0 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 171782e2bb39..1024ae158227 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2470,6 +2470,10 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
         if (!(dev->flags & IFF_MASTER))
                 goto out;
 
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out;
+
         if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
                 goto out;
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index f4e638c65129..5c6fba802f2b 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -326,6 +326,10 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
                 goto out;
         }
 
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out;
+
         if (!pskb_may_pull(skb, arp_hdr_len(bond_dev)))
                 goto out;
 
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b1025b85acf1..163e0b06eaa5 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2733,6 +2733,10 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         if (!slave || !slave_do_arp_validate(bond, slave))
                 goto out_unlock;
 
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out_unlock;
+
         if (!pskb_may_pull(skb, arp_hdr_len(dev)))
                 goto out_unlock;