Skip to contentSkip to conversation

FAILED: patch "[PATCH] net: bcmgenet: fix OF child-node lookup" failed to apply to 4.4-stable tree

PATCH [email protected] 3 participants 3 messages Nov 12, 2018 – Nov 29, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From d397dbe606120a1ea1b11b0020c3f7a3852da5ac Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Mon, 27 Aug 2018 10:21:50 +0200
Subject: [PATCH] net: bcmgenet: fix OF child-node lookup

Use the new of_get_compatible_child() helper to lookup the mdio child node instead of using of_find_compatible_node(), which searches the entire tree from a given start node and thus can return an unrelated (i.e. non-child) node.

This also addresses a potential use-after-free (e.g. after probe deferral) as the tree-wide helper drops a reference to its first argument (i.e. the node of the device being probed).

Fixes aa09677cba42 ("net: bcmgenet: add MDIO routines")
Cc stable <[email protected]> # 3.15
Cc David S. Miller <[email protected]>
drivers/net/ethernet/broadcom/genet/bcmmii.c +1 -1
index 5333274a283c..87fc65560ceb 100644
@@ -333,7 +333,7 @@ static struct device_node *bcmgenet_mii_of_find_mdio(struct bcmgenet_priv *priv)
 	if (!compat)
 		return NULL;
 
-	priv->mdio_dn = of_find_compatible_node(dn, NULL, compat);
+	priv->mdio_dn = of_get_compatible_child(dn, compat);
 	kfree(compat);
 	if (!priv->mdio_dn) {
 		dev_err(kdev, "unable to find MDIO bus node\n");
#1 lore raw
Quoted 5 lines · Greg Kroah-Hartman

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

This one also depends on

36156f9241cb ("of: add helper to lookup compatible child node")

Johan

Quoted 37 lines

------------------ original commit in Linus's tree ------------------

From d397dbe606120a1ea1b11b0020c3f7a3852da5ac Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Mon, 27 Aug 2018 10:21:50 +0200
Subject: [PATCH] net: bcmgenet: fix OF child-node lookup

Use the new of_get_compatible_child() helper to lookup the mdio child node instead of using of_find_compatible_node(), which searches the entire tree from a given start node and thus can return an unrelated (i.e. non-child) node.

This also addresses a potential use-after-free (e.g. after probe deferral) as the tree-wide helper drops a reference to its first argument (i.e. the node of the device being probed).

Fixes aa09677cba42 ("net: bcmgenet: add MDIO routines")
Cc stable <[email protected]> # 3.15
Cc David S. Miller <[email protected]>
drivers/net/ethernet/broadcom/genet/bcmmii.c +1 -1
index 5333274a283c..87fc65560ceb 100644
@@ -333,7 +333,7 @@ static struct device_node *bcmgenet_mii_of_find_mdio(struct bcmgenet_priv *priv)
 	if (!compat)
 		return NULL;
 
-	priv->mdio_dn = of_find_compatible_node(dn, NULL, compat);
+	priv->mdio_dn = of_get_compatible_child(dn, compat);
 	kfree(compat);
 	if (!priv->mdio_dn) {
 		dev_err(kdev, "unable to find MDIO bus node\n");
maintainer
#2 lore raw
Quoted 10 lines · Johan Hovold
Quoted 5 lines · Greg Kroah-Hartman

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

This one also depends on

36156f9241cb ("of: add helper to lookup compatible child node")

Now queued, thank you.

--
Thanks,
Sasha