From: Greg Kroah-Hartman Date: Sun, 11 Nov 2018 14:33:25 +0000 (-0800) Subject: drop broken 4.4 patch X-Git-Tag: v4.19.2~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbe70c9cb82a2dd99c8b31b896618b0df320080b;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken 4.4 patch --- diff --git a/queue-4.4/net-bcmgenet-fix-of-child-node-lookup.patch b/queue-4.4/net-bcmgenet-fix-of-child-node-lookup.patch deleted file mode 100644 index c9ab59a3658..00000000000 --- a/queue-4.4/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 -@@ -491,7 +491,7 @@ static int bcmgenet_mii_of_init(struct b - if (!compat) - return -ENOMEM; - -- 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.4/series b/queue-4.4/series index 616732f3f55..08fa35cec0a 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -77,5 +77,4 @@ dm-ioctl-harden-copy_params-s-copy_from_user-from-malicious-users.patch powerpc-msi-fix-compile-error-on-mpc83xx.patch mips-octeon-fix-out-of-bounds-array-access-on-cn68xx.patch tc-set-dma-masks-for-devices.patch -net-bcmgenet-fix-of-child-node-lookup.patch kgdboc-passing-ekgdboc-to-command-line-causes-panic.patch