From: Greg Kroah-Hartman Date: Sun, 11 Nov 2018 15:58:06 +0000 (-0800) Subject: drop net-bcmgenet-fix-of-child-node-lookup.patch from 4.14 X-Git-Tag: v4.19.2~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fbdfe31dda4337d2fff86fd3f5133286804360a;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-bcmgenet-fix-of-child-node-lookup.patch from 4.14 --- diff --git a/queue-4.14/net-bcmgenet-fix-of-child-node-lookup.patch b/queue-4.14/net-bcmgenet-fix-of-child-node-lookup.patch deleted file mode 100644 index 522dedccfe0..00000000000 --- a/queue-4.14/net-bcmgenet-fix-of-child-node-lookup.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d397dbe606120a1ea1b11b0020c3f7a3852da5ac Mon Sep 17 00:00:00 2001 -From: Johan Hovold -Date: Mon, 27 Aug 2018 10:21:50 +0200 -Subject: net: bcmgenet: fix OF child-node lookup - -From: Johan Hovold - -commit d397dbe606120a1ea1b11b0020c3f7a3852da5ac upstream. - -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 # 3.15 -Cc: David S. Miller -Reviewed-by: Florian Fainelli -Signed-off-by: Johan Hovold -Signed-off-by: Rob Herring -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/ethernet/broadcom/genet/bcmmii.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c -@@ -360,7 +360,7 @@ static struct device_node *bcmgenet_mii_ - 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"); diff --git a/queue-4.14/series b/queue-4.14/series index e5ec7df39ed..d72ffe8c248 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -180,6 +180,5 @@ mips-octeon-fix-out-of-bounds-array-access-on-cn68xx.patch power-supply-twl4030-charger-fix-of-sibling-node-lookup.patch iommu-arm-smmu-ensure-that-page-table-updates-are-visible-before-tlbi.patch tc-set-dma-masks-for-devices.patch -net-bcmgenet-fix-of-child-node-lookup.patch media-v4l2-tpg-fix-kernel-oops-when-enabling-hflip-and-osd.patch kgdboc-passing-ekgdboc-to-command-line-causes-panic.patch