From patchwork Tue Mar 16 14:53:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47850 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6BF9DB7DA7 for ; Wed, 17 Mar 2010 02:01:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966426Ab0CPPBQ (ORCPT ); Tue, 16 Mar 2010 11:01:16 -0400 Received: from mail.pripojeni.net ([217.66.174.14]:55730 "EHLO mail.jetsystems.cz" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S966328Ab0CPPBQ (ORCPT ); Tue, 16 Mar 2010 11:01:16 -0400 X-Greylist: delayed 438 seconds by postgrey-1.27 at vger.kernel.org; Tue, 16 Mar 2010 11:01:15 EDT Received: from localhost.localdomain ([217.66.174.142]) by mail.jetsystems.cz (Kerio Connect 7.0.0 patch 1); Tue, 16 Mar 2010 15:54:59 +0100 From: Jiri Slaby To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jirislaby@gmail.com, Tristram Ha Subject: [PATCH 1/1] NET: ksz884x, fix lock imbalance Date: Tue, 16 Mar 2010 15:53:50 +0100 Message-Id: <1268751230-14416-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.7.0.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: Tristram Ha Cc: David S. Miller --- 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;