Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f162b9d5 authored by Andy Fleming's avatar Andy Fleming Committed by Jeff Garzik
Browse files

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: default avatarAndy Fleming <afleming@freescale.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 569f0c4d

drivers/net/gianfar.c

+3 −2
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ static int gfar_poll(struct napi_struct *napi, int budget); 
static void gfar_netpoll(struct net_device *dev);

#endif

int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit);

static int gfar_clean_tx_ring(struct net_device *dev);

static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int length);

static void gfar_vlan_rx_register(struct net_device *netdev,

		                struct vlan_group *grp);
@@ -1141,7 +1142,7 @@ static int gfar_close(struct net_device *dev) 
}



/* Changes the mac address if the controller is not running. */

int gfar_set_mac_address(struct net_device *dev)

static int gfar_set_mac_address(struct net_device *dev)

{

	gfar_set_mac_for_addr(dev, 0, dev->dev_addr);
@@ -1260,7 +1261,7 @@ static void gfar_timeout(struct net_device *dev) 
}



/* Interrupt Handler for Transmit complete */

int gfar_clean_tx_ring(struct net_device *dev)

static int gfar_clean_tx_ring(struct net_device *dev)

{

	struct txbd8 *bdp;

	struct gfar_private *priv = netdev_priv(dev);

drivers/net/gianfar.h

+3 −0
Original line number Diff line number Diff line
@@ -782,5 +782,8 @@ extern void gfar_halt(struct net_device *dev); 
extern void gfar_phy_test(struct mii_bus *bus, struct phy_device *phydev,

		int enable, u32 regnum, u32 read);

void gfar_init_sysfs(struct net_device *dev);

int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id,

			  int regnum, u16 value);

int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum);



#endif /* __GIANFAR_H */

drivers/net/gianfar_sysfs.c

+6 −4
Original line number Diff line number Diff line
@@ -103,10 +103,10 @@ static ssize_t gfar_set_rx_stash_size(struct device *dev, 


	spin_lock_irqsave(&priv->rxlock, flags);

	if (length > priv->rx_buffer_size)

		return count;

		goto out;



	if (length == priv->rx_stash_size)

		return count;

		goto out;



	priv->rx_stash_size = length;
@@ -125,6 +125,7 @@ static ssize_t gfar_set_rx_stash_size(struct device *dev, 


	gfar_write(&priv->regs->attr, temp);



out:

	spin_unlock_irqrestore(&priv->rxlock, flags);



	return count;
@@ -154,10 +155,10 @@ static ssize_t gfar_set_rx_stash_index(struct device *dev, 


	spin_lock_irqsave(&priv->rxlock, flags);

	if (index > priv->rx_stash_size)

		return count;

		goto out;



	if (index == priv->rx_stash_index)

		return count;

		goto out;



	priv->rx_stash_index = index;
@@ -166,6 +167,7 @@ static ssize_t gfar_set_rx_stash_index(struct device *dev, 
	temp |= ATTRELI_EI(index);

	gfar_write(&priv->regs->attreli, flags);



out:

	spin_unlock_irqrestore(&priv->rxlock, flags);



	return count;