ipoib: returned back addrlen check for mc addresses
authorJiri Pirko <jpirko@redhat.com>
Sat, 27 Feb 2010 12:07:33 +0000 (12:07 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 28 Feb 2010 09:34:28 +0000 (01:34 -0800)
Apparently bogus mc address can break IPOIB multicast processing. Therefore
returning the check for addrlen back until this is resolved in bonding (I don't
see any other point from where mc address with non-dev->addr_len length can came
from).

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/infiniband/ulp/ipoib/ipoib_multicast.c

index 19eba3c877cb1512c275aed83aece54c47b2e51e..d41ea27be5e196998d97ced405837433d46586cb 100644 (file)
@@ -767,8 +767,11 @@ void ipoib_mcast_dev_flush(struct net_device *dev)
        }
 }
 
-static int ipoib_mcast_addr_is_valid(const u8 *addr, const u8 *broadcast)
+static int ipoib_mcast_addr_is_valid(const u8 *addr, unsigned int addrlen,
+                                    const u8 *broadcast)
 {
+       if (addrlen != INFINIBAND_ALEN)
+               return 0;
        /* reserved QPN, prefix, scope */
        if (memcmp(addr, broadcast, 6))
                return 0;
@@ -812,6 +815,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
                union ib_gid mgid;
 
                if (!ipoib_mcast_addr_is_valid(mclist->dmi_addr,
+                                              mclist->dmi_addrlen,
                                               dev->broadcast))
                        continue;