| From 64ebed2b25ecf5117fd45027508e40dd3fc13ced Mon Sep 17 00:00:00 2001 |
| From: Eugeniu Rosca <erosca@de.adit-jv.com> |
| Date: Wed, 26 Feb 2020 18:50:35 +0100 |
| Subject: [PATCH] usb: core: hub: do error out if usb_autopm_get_interface() |
| fails |
| |
| commit 60e3f6e4ac5b0fda43dad01c32e09409ec710045 upstream. |
| |
| Reviewing a fresh portion of coverity defects in USB core |
| (specifically CID 1458999), Alan Stern noted below in [1]: |
| |
| On Tue, Feb 25, 2020 at 02:39:23PM -0500, Alan Stern wrote: |
| > A revised search finds line 997 in drivers/usb/core/hub.c and lines |
| > 216, 269 in drivers/usb/core/port.c. (I didn't try looking in any |
| > other directories.) AFAICT all three of these should check the |
| > return value, although a error message in the kernel log probably |
| > isn't needed. |
| |
| Factor out the usb_remove_device() change into a standalone patch to |
| allow conflict-free integration on top of the earliest stable branches. |
| |
| [1] https://lore.kernel.org/lkml/Pine.LNX.4.44L0.2002251419120.1485-100000@iolanthe.rowland.org |
| |
| Fixes: 253e05724f9230 ("USB: add a "remove hardware" sysfs attribute") |
| Cc: stable@vger.kernel.org # v2.6.33+ |
| Suggested-by: Alan Stern <stern@rowland.harvard.edu> |
| Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com> |
| Acked-by: Alan Stern <stern@rowland.harvard.edu> |
| Link: https://lore.kernel.org/r/20200226175036.14946-2-erosca@de.adit-jv.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c |
| index 160ed9bd4ca3..d37d0588216b 100644 |
| --- a/drivers/usb/core/hub.c |
| +++ b/drivers/usb/core/hub.c |
| @@ -987,13 +987,17 @@ int usb_remove_device(struct usb_device *udev) |
| { |
| struct usb_hub *hub; |
| struct usb_interface *intf; |
| + int ret; |
| |
| if (!udev->parent) /* Can't remove a root hub */ |
| return -EINVAL; |
| hub = usb_hub_to_struct_hub(udev->parent); |
| intf = to_usb_interface(hub->intfdev); |
| |
| - usb_autopm_get_interface(intf); |
| + ret = usb_autopm_get_interface(intf); |
| + if (ret < 0) |
| + return ret; |
| + |
| set_bit(udev->portnum, hub->removed_bits); |
| hub_port_logical_disconnect(hub, udev->portnum); |
| usb_autopm_put_interface(intf); |
| -- |
| 2.7.4 |
| |