From: Ben Chan <benchan@chromium.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Ben Chan <benchan@chromium.org>, Sage Ahn <syahn@gctsemi.com>
Subject: [PATCH] staging: gdm72xx: Fix spinlock recursion on gdm_usb_send_complete
Date: Wed, 6 Jun 2012 23:01:26 -0700 [thread overview]
Message-ID: <1339048886-11956-1-git-send-email-benchan@chromium.org> (raw)
This patch fixes a spinlock recursion bug on several call sites of
gdm_usb_send_complete by not calling spin_lock_irqsave on
urb->context->tx_cxt->lock when the lock has already been acquired.
Signed-off-by: Ben Chan <benchan@chromium.org>
Cc: Sage Ahn <syahn@gctsemi.com>
---
drivers/staging/gdm72xx/gdm_usb.c | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c
index 1e9dc0d..a362e0c 100644
--- a/drivers/staging/gdm72xx/gdm_usb.c
+++ b/drivers/staging/gdm72xx/gdm_usb.c
@@ -270,7 +270,7 @@ static void release_usb(struct usbwm_dev *udev)
}
}
-static void gdm_usb_send_complete(struct urb *urb)
+static void gdm_usb_send_complete_impl(struct urb *urb, bool need_lock)
{
struct usb_tx *t = urb->context;
struct tx_cxt *tx = t->tx_cxt;
@@ -282,7 +282,8 @@ static void gdm_usb_send_complete(struct urb *urb)
if (urb->status == -ECONNRESET)
return;
- spin_lock_irqsave(&tx->lock, flags);
+ if (need_lock)
+ spin_lock_irqsave(&tx->lock, flags);
if (t->callback)
t->callback(t->cb_data);
@@ -296,7 +297,18 @@ static void gdm_usb_send_complete(struct urb *urb)
else
free_tx_struct(t);
- spin_unlock_irqrestore(&tx->lock, flags);
+ if (need_lock)
+ spin_unlock_irqrestore(&tx->lock, flags);
+}
+
+static void gdm_usb_send_complete(struct urb *urb)
+{
+ gdm_usb_send_complete_impl(urb, true);
+}
+
+static void gdm_usb_send_complete_no_lock(struct urb *urb)
+{
+ gdm_usb_send_complete_impl(urb, false);
}
static int gdm_usb_send(void *priv_dev, void *data, int len,
@@ -411,7 +423,7 @@ out:
send_fail:
t->callback = NULL;
- gdm_usb_send_complete(t->urb);
+ gdm_usb_send_complete_no_lock(t->urb);
spin_unlock_irqrestore(&tx->lock, flags);
return ret;
}
@@ -540,7 +552,7 @@ static void do_pm_control(struct work_struct *work)
if (ret) {
t->callback = NULL;
- gdm_usb_send_complete(t->urb);
+ gdm_usb_send_complete_no_lock(t->urb);
}
}
}
@@ -742,7 +754,7 @@ static int k_mode_thread(void *arg)
if (ret) {
t->callback = NULL;
- gdm_usb_send_complete(t->urb);
+ gdm_usb_send_complete_no_lock(t->urb);
}
}
--
1.7.7.3
next reply other threads:[~2012-06-07 6:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-07 6:01 Ben Chan [this message]
2012-06-12 19:23 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339048886-11956-1-git-send-email-benchan@chromium.org \
--to=benchan@chromium.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syahn@gctsemi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®