| From: Shuah Khan <shuahkh@osg.samsung.com> |
| Date: Mon, 2 Apr 2018 14:52:32 -0600 |
| Subject: usbip: vhci_hcd: Fix usb device and sockfd leaks |
| |
| commit 9020a7efe537856eb3e826ebebdf38a5d07a7857 upstream. |
| |
| vhci_hcd fails to do reset to put usb device and sockfd in the |
| module remove/stop paths. Fix the leak. |
| |
| Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| [bwh: Backported to 3.16: adjust filename] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/staging/usbip/usbip_common.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/staging/usbip/usbip_common.h |
| +++ b/drivers/staging/usbip/usbip_common.h |
| @@ -248,7 +248,7 @@ enum usbip_side { |
| #define SDEV_EVENT_ERROR_SUBMIT (USBIP_EH_SHUTDOWN | USBIP_EH_RESET) |
| #define SDEV_EVENT_ERROR_MALLOC (USBIP_EH_SHUTDOWN | USBIP_EH_UNUSABLE) |
| |
| -#define VDEV_EVENT_REMOVED (USBIP_EH_SHUTDOWN | USBIP_EH_BYE) |
| +#define VDEV_EVENT_REMOVED (USBIP_EH_SHUTDOWN | USBIP_EH_RESET | USBIP_EH_BYE) |
| #define VDEV_EVENT_DOWN (USBIP_EH_SHUTDOWN | USBIP_EH_RESET) |
| #define VDEV_EVENT_ERROR_TCP (USBIP_EH_SHUTDOWN | USBIP_EH_RESET) |
| #define VDEV_EVENT_ERROR_MALLOC (USBIP_EH_SHUTDOWN | USBIP_EH_UNUSABLE) |
