* [PATCH 1/1] NET: ksz884x, fix lock imbalance
@ 2010-03-16 14:53 Jiri Slaby
2010-03-16 21:28 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jiri Slaby @ 2010-03-16 14:53 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, jirislaby, Tristram Ha
Stanse found that one error path (when alloc_skb fails) in netdev_tx
omits to unlock hw_priv->hwlock. Fix that.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Tristram Ha <Tristram.Ha@micrel.com>
Cc: David S. Miller <davem@davemloft.net>
---
drivers/net/ksz884x.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index 7264a3e..0f59099 100644
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -4899,8 +4899,10 @@ static int netdev_tx(struct sk_buff *skb, struct net_device *dev)
struct sk_buff *org_skb = skb;
skb = dev_alloc_skb(org_skb->len);
- if (!skb)
- return NETDEV_TX_BUSY;
+ if (!skb) {
+ rc = NETDEV_TX_BUSY;
+ goto unlock;
+ }
skb_copy_and_csum_dev(org_skb, skb->data);
org_skb->ip_summed = 0;
skb->len = org_skb->len;
@@ -4914,7 +4916,7 @@ static int netdev_tx(struct sk_buff *skb, struct net_device *dev)
netif_stop_queue(dev);
rc = NETDEV_TX_BUSY;
}
-
+unlock:
spin_unlock_irq(&hw_priv->hwlock);
return rc;
--
1.7.0.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] NET: ksz884x, fix lock imbalance
2010-03-16 14:53 [PATCH 1/1] NET: ksz884x, fix lock imbalance Jiri Slaby
@ 2010-03-16 21:28 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-03-16 21:28 UTC (permalink / raw)
To: jslaby; +Cc: netdev, linux-kernel, jirislaby, Tristram.Ha
From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 16 Mar 2010 15:53:50 +0100
> Stanse found that one error path (when alloc_skb fails) in netdev_tx
> omits to unlock hw_priv->hwlock. Fix that.
>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: Tristram Ha <Tristram.Ha@micrel.com>
> Cc: David S. Miller <davem@davemloft.net>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-16 21:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-16 14:53 [PATCH 1/1] NET: ksz884x, fix lock imbalance Jiri Slaby
2010-03-16 21:28 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).