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

Commit dd13c86b authored by Ben Chan's avatar Ben Chan Committed by Greg Kroah-Hartman
Browse files

staging: gdm72xx: Fix spinlock recursion on gdm_usb_send_complete 



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: default avatarBen Chan <benchan@chromium.org>
Cc: Sage Ahn <syahn@gctsemi.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7dd80eb9

drivers/staging/gdm72xx/gdm_usb.c

+18 −6
Original line number Diff line number Diff line
@@ -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,6 +282,7 @@ static void gdm_usb_send_complete(struct urb *urb) 
	if (urb->status == -ECONNRESET)

		return;



	if (need_lock)

		spin_lock_irqsave(&tx->lock, flags);



	if (t->callback)
@@ -296,9 +297,20 @@ static void gdm_usb_send_complete(struct urb *urb) 
	else

		free_tx_struct(t);



	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,

			void (*cb)(void *data), void *cb_data)

{
@@ -411,7 +423,7 @@ static int gdm_usb_send(void *priv_dev, void *data, int len, 


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);

				}

			}