bonding: in bond_mc_swap() bond's mc addr list is walked without lock

nikolay@redhat.com · davem330 · commit d632ce989c81 · 2013-04-19T17:48:19.000-04:00
Use netif_addr_lock_bh() to acquire the appropriate lock before walking.

Signed-off-by: Nikolay Aleksandrov &lt;nikolay@redhat.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
@@ -846,8 +846,10 @@ static void bond_mc_swap(struct bonding *bond, struct slave *new_active,
 		if (bond->dev->flags & IFF_ALLMULTI)
 			dev_set_allmulti(old_active->dev, -1);
 
+		netif_addr_lock_bh(bond->dev);
 		netdev_for_each_mc_addr(ha, bond->dev)
 			dev_mc_del(old_active->dev, ha->addr);
+		netif_addr_unlock_bh(bond->dev);
 	}
 
 	if (new_active) {
@@ -858,8 +860,10 @@ static void bond_mc_swap(struct bonding *bond, struct slave *new_active,
 		if (bond->dev->flags & IFF_ALLMULTI)
 			dev_set_allmulti(new_active->dev, 1);
 
+		netif_addr_lock_bh(bond->dev);
 		netdev_for_each_mc_addr(ha, bond->dev)
 			dev_mc_add(new_active->dev, ha->addr);
+		netif_addr_unlock_bh(bond->dev);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -846,8 +846,10 @@ static void bond_mc_swap(struct bonding bond, struct slave new_active,`
`846`	`846`	`if (bond->dev->flags & IFF_ALLMULTI)`
`847`	`847`	`dev_set_allmulti(old_active->dev, -1);`
`848`	`848`
	`849`	`+ netif_addr_lock_bh(bond->dev);`
`849`	`850`	`netdev_for_each_mc_addr(ha, bond->dev)`
`850`	`851`	`dev_mc_del(old_active->dev, ha->addr);`
	`852`	`+ netif_addr_unlock_bh(bond->dev);`
`851`	`853`	`}`
`852`	`854`
`853`	`855`	`if (new_active) {`
`@@ -858,8 +860,10 @@ static void bond_mc_swap(struct bonding bond, struct slave new_active,`
`858`	`860`	`if (bond->dev->flags & IFF_ALLMULTI)`
`859`	`861`	`dev_set_allmulti(new_active->dev, 1);`
`860`	`862`
	`863`	`+ netif_addr_lock_bh(bond->dev);`
`861`	`864`	`netdev_for_each_mc_addr(ha, bond->dev)`
`862`	`865`	`dev_mc_add(new_active->dev, ha->addr);`
	`866`	`+ netif_addr_unlock_bh(bond->dev);`
`863`	`867`	`}`
`864`	`868`	`}`
`865`	`869`