1 files changed, 14 insertions, 5 deletions

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index c6247fc84060..c04607b49212 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -872,11 +872,18 @@ int igmp_rcv(struct sk_buff *skb)
                 return 0;
         }
 
-        if (!pskb_may_pull(skb, sizeof(struct igmphdr)) || 
-            (u16)csum_fold(skb_checksum(skb, 0, len, 0))) {
-                in_dev_put(in_dev);
-                kfree_skb(skb);
-                return 0;
+        if (!pskb_may_pull(skb, sizeof(struct igmphdr)))
+                goto drop;
+
+        switch (skb->ip_summed) {
+        case CHECKSUM_HW:
+                if (!(u16)csum_fold(skb->csum))
+                        break;
+                /* fall through */
+        case CHECKSUM_NONE:
+                skb->csum = 0;
+                if (__skb_checksum_complete(skb))
+                        goto drop;
         }
 
         ih = skb->h.igmph;
@@ -906,6 +913,8 @@ int igmp_rcv(struct sk_buff *skb)
         default:
                 NETDEBUG(KERN_DEBUG "New IGMP type=%d, why we do not know about it?\n", ih->type);
         }
+
+drop:
         in_dev_put(in_dev);
         kfree_skb(skb);
         return 0;