Skip to contentSkip to conversation

Patch "USB: ehci-platform: fix companion-device leak" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message May 23, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

USB: ehci-platform: fix companion-device leak

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-ehci-platform-fix-companion-device-leak.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From a7415477a20448bbb7d13765784c0b29249a176f Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Tue, 16 May 2017 16:26:13 +0200
Subject: USB: ehci-platform: fix companion-device leak

From: Johan Hovold <[email protected]>

commit a7415477a20448bbb7d13765784c0b29249a176f upstream.

Make sure do drop the reference taken to the companion device during resume.

Fixes d4d75128b8fd ("usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume")
---
 drivers/usb/host/ehci-platform.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/host/ehci-platform.c +3 -1
@@ -378,8 +378,10 @@ static int ehci_platform_resume(struct d
 	}
 
 	companion_dev = usb_of_get_companion_dev(hcd->self.controller);
-	if (companion_dev)
+	if (companion_dev) {
 		device_pm_wait_for_dev(hcd->self.controller, companion_dev);
+		put_device(companion_dev);
+	}
 
 	ehci_resume(hcd, priv->reset_on_resume);
 	return 0;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/usb-serial-io_ti-fix-div-by-zero-in-set_termios.patch queue-4.4/usb-hub-fix-non-ss-hub-descriptor-handling.patch queue-4.4/usb-serial-ftdi_sio-add-olimex-arm-usb-tiny-h-pids.patch queue-4.4/usb-serial-ftdi_sio-fix-setting-latency-for-unprivileged-users.patch queue-4.4/usb-iowarrior-fix-info-ioctl-on-big-endian-hosts.patch queue-4.4/watchdog-pcwd_usb-fix-null-deref-at-probe.patch queue-4.4/usb-serial-qcserial-add-more-lenovo-em74xx-device-ids.patch queue-4.4/usb-serial-option-add-telit-me910-support.patch queue-4.4/net-irda-irda-usb-fix-firmware-name-on-big-endian-hosts.patch queue-4.4/usbvision-fix-null-deref-at-probe.patch queue-4.4/usb-serial-mct_u232-fix-big-endian-baud-rate-handling.patch queue-4.4/usb-ehci-platform-fix-companion-device-leak.patch queue-4.4/mceusb-fix-null-deref-at-probe.patch queue-4.4/usb-hub-fix-ss-hub-descriptor-handling.patch queue-4.4/ath9k_htc-fix-null-deref-at-probe.patch