mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
NET: ksz884x, fix lock imbalance
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 <[email protected]> Cc: Tristram Ha <[email protected]> Cc: David S. Miller <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
6ad34145cf
commit
edee39321b
1 changed files with 5 additions and 3 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue