Skip to contentSkip to conversation

Patch "USB: ulpi: fix bus-node lookup" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Dec 7, 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: ulpi: fix bus-node lookup

to the 4.14-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-ulpi-fix-bus-node-lookup.patch
and it can be found in the queue-4.14 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 33c309ebc797b908029fd3a0851aefe697e9b598 Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Sat, 11 Nov 2017 16:31:18 +0100
Subject: USB: ulpi: fix bus-node lookup

From: Johan Hovold <[email protected]>

commit 33c309ebc797b908029fd3a0851aefe697e9b598 upstream.

Fix bus-node lookup during registration, which ended up searching the whole device tree depth-first starting at the parent (or grand parent) rather than just matching on its children.

To make things worse, the parent (or grand-parent) node could end being prematurely freed as well.

Fixes ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT")
---
 drivers/usb/common/ulpi.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/common/ulpi.c +2 -2
@@ -183,9 +183,9 @@ static int ulpi_of_register(struct ulpi
 	/* Find a ulpi bus underneath the parent or the grandparent */
 	parent = ulpi->dev.parent;
 	if (parent->of_node)
-		np = of_find_node_by_name(parent->of_node, "ulpi");
+		np = of_get_child_by_name(parent->of_node, "ulpi");
 	else if (parent->parent && parent->parent->of_node)
-		np = of_find_node_by_name(parent->parent->of_node, "ulpi");
+		np = of_get_child_by_name(parent->parent->of_node, "ulpi");
 	if (!np)
 		return 0;
 

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

queue-4.14/staging-greybus-loopback-fix-iteration-count-on-async-path.patch queue-4.14/usb-serial-usb_debug-add-new-usb-device-id.patch queue-4.14/spi-spi-axi-fix-potential-use-after-free-after-deregistration.patch queue-4.14/usb-ulpi-fix-bus-node-lookup.patch queue-4.14/usb-serial-option-add-quectel-bg96-id.patch