commit f162b9d58273a9a5747211133c8ccb2de5cf5ff2 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

gianfar: Fix a locking bug in gianfar's sysfs code

During sparse cleanup, found a locking bug. Some of the sysfs functions were
acquiring a lock, and then returning in the event of an error. We rearrange
the code so that the lock is released in error conditions, too.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by Andy Fleming and committed by Jeff Garzik 18 years ago f162b9d5 569f0c4d

+12 -6

3 changed files

expand all

unified split

drivers

net

gianfar.c

gianfar.h

gianfar_sysfs.c

+3 -2

drivers/net/gianfar.c

··· 138 138 static void gfar_netpoll(struct net_device *dev); 139 139 #endif 140 140 int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit); 141 + static int gfar_clean_tx_ring(struct net_device *dev); 141 142 static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int length); 142 143 static void gfar_vlan_rx_register(struct net_device *netdev, 143 144 struct vlan_group *grp); ··· 1142 1141 } 1143 1142 1144 1143 /* Changes the mac address if the controller is not running. */ 1145 - int gfar_set_mac_address(struct net_device *dev) 1144 + static int gfar_set_mac_address(struct net_device *dev) 1146 1145 { 1147 1146 gfar_set_mac_for_addr(dev, 0, dev->dev_addr); 1148 1147 ··· 1261 1260 } 1262 1261 1263 1262 /* Interrupt Handler for Transmit complete */ 1264 - int gfar_clean_tx_ring(struct net_device *dev) 1263 + static int gfar_clean_tx_ring(struct net_device *dev) 1265 1264 { 1266 1265 struct txbd8 *bdp; 1267 1266 struct gfar_private *priv = netdev_priv(dev);

drivers/net/gianfar.h

··· 782 782 extern void gfar_phy_test(struct mii_bus *bus, struct phy_device *phydev, 783 783 int enable, u32 regnum, u32 read); 784 784 void gfar_init_sysfs(struct net_device *dev); 785 + int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id, 786 + int regnum, u16 value); 787 + int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum); 785 788 786 789 #endif /* __GIANFAR_H */

+6 -4

drivers/net/gianfar_sysfs.c

··· 103 103 104 104 spin_lock_irqsave(&priv->rxlock, flags); 105 105 if (length > priv->rx_buffer_size) 106 - return count; 106 + goto out; 107 107 108 108 if (length == priv->rx_stash_size) 109 - return count; 109 + goto out; 110 110 111 111 priv->rx_stash_size = length; 112 112 ··· 125 125 126 126 gfar_write(&priv->regs->attr, temp); 127 127 128 + out: 128 129 spin_unlock_irqrestore(&priv->rxlock, flags); 129 130 130 131 return count; ··· 155 154 156 155 spin_lock_irqsave(&priv->rxlock, flags); 157 156 if (index > priv->rx_stash_size) 158 - return count; 157 + goto out; 159 158 160 159 if (index == priv->rx_stash_index) 161 - return count; 160 + goto out; 162 161 163 162 priv->rx_stash_index = index; 164 163 ··· 167 166 temp |= ATTRELI_EI(index); 168 167 gfar_write(&priv->regs->attreli, flags); 169 168 169 + out: 170 170 spin_unlock_irqrestore(&priv->rxlock, flags); 171 171 172 172 return count;