From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Mayank Rana <mrana@codeaurora.org>,
Jack Pham <jackp@codeaurora.org>,
Mathias Nyman <mathias.nyman@linux.intel.com>
Subject: [PATCH 3.18 03/11] usb: xhci: Handle error condition in xhci_stop_device()
Date: Tue, 31 Oct 2017 10:54:40 +0100 [thread overview]
Message-ID: <20171031095324.616667285@linuxfoundation.org> (raw)
In-Reply-To: <20171031095324.488947183@linuxfoundation.org>
3.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mayank Rana <mrana@codeaurora.org>
commit b3207c65dfafae27e7c492cb9188c0dc0eeaf3fd upstream.
xhci_stop_device() calls xhci_queue_stop_endpoint() multiple times
without checking the return value. xhci_queue_stop_endpoint() can
return error if the HC is already halted or unable to queue commands.
This can cause a deadlock condition as xhci_stop_device() would
end up waiting indefinitely for a completion for the command that
didn't get queued. Fix this by checking the return value and bailing
out of xhci_stop_device() in case of error. This patch happens to fix
potential memory leaks of the allocated command structures as well.
Fixes: c311e391a7ef ("xhci: rework command timeout and cancellation,")
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/usb/host/xhci-hub.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -293,15 +293,25 @@ static int xhci_stop_device(struct xhci_
GFP_NOWAIT);
if (!command) {
spin_unlock_irqrestore(&xhci->lock, flags);
- xhci_free_command(xhci, cmd);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto cmd_cleanup;
+ }
+ ret = xhci_queue_stop_endpoint(xhci, command, slot_id,
+ i, suspend);
+ if (ret) {
+ spin_unlock_irqrestore(&xhci->lock, flags);
+ xhci_free_command(xhci, command);
+ goto cmd_cleanup;
}
- xhci_queue_stop_endpoint(xhci, command, slot_id, i,
- suspend);
}
}
- xhci_queue_stop_endpoint(xhci, cmd, slot_id, 0, suspend);
+ ret = xhci_queue_stop_endpoint(xhci, cmd, slot_id, 0, suspend);
+ if (ret) {
+ spin_unlock_irqrestore(&xhci->lock, flags);
+ goto cmd_cleanup;
+ }
+
xhci_ring_cmd_db(xhci);
spin_unlock_irqrestore(&xhci->lock, flags);
@@ -312,6 +322,8 @@ static int xhci_stop_device(struct xhci_
xhci_warn(xhci, "Timeout while waiting for stop endpoint command\n");
ret = -ETIME;
}
+
+cmd_cleanup:
xhci_free_command(xhci, cmd);
return ret;
}
next prev parent reply other threads:[~2017-10-31 9:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-31 9:54 [PATCH 3.18 00/11] 3.18.79-stable review Greg Kroah-Hartman
2017-10-31 9:54 ` [PATCH 3.18 01/11] ALSA: hda - fix headset mic problem for Dell machines with alc236 Greg Kroah-Hartman
2017-10-31 10:42 ` Takashi Iwai
2017-11-01 15:20 ` Greg Kroah-Hartman
2017-10-31 9:54 ` [PATCH 3.18 02/11] ceph: unlock dangling spinlock in try_flush_caps() Greg Kroah-Hartman
2017-10-31 9:54 ` Greg Kroah-Hartman [this message]
2017-10-31 9:54 ` [PATCH 3.18 04/11] spi: uapi: spidev: add missing ioctl header Greg Kroah-Hartman
2017-10-31 9:54 ` [PATCH 3.18 05/11] fuse: fix READDIRPLUS skipping an entry Greg Kroah-Hartman
2017-10-31 9:54 ` [PATCH 3.18 06/11] Input: gtco - fix potential out-of-bound access Greg Kroah-Hartman
2017-10-31 9:54 ` [PATCH 3.18 07/11] assoc_array: Fix a buggy node-splitting case Greg Kroah-Hartman
2017-10-31 9:54 ` [PATCH 3.18 08/11] scsi: zfcp: fix erp_action use-before-initialize in REC action trace Greg Kroah-Hartman
2017-10-31 9:54 ` [PATCH 3.18 09/11] scsi: sg: Re-fix off by one in sg_fill_request_table() Greg Kroah-Hartman
2017-10-31 9:54 ` [PATCH 3.18 10/11] can: kvaser_usb: Correct return value in printout Greg Kroah-Hartman
2017-10-31 9:54 ` [PATCH 3.18 11/11] ecryptfs: fix dereference of NULL user_key_payload Greg Kroah-Hartman
2017-10-31 17:18 ` [PATCH 3.18 00/11] 3.18.79-stable review Guenter Roeck
2017-10-31 20:04 ` Shuah Khan
2017-11-01 15:20 ` Greg Kroah-Hartman
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=20171031095324.616667285@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=jackp@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathias.nyman@linux.intel.com \
--cc=mrana@codeaurora.org \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).