]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: phy: fixed_phy: fix use-after-free when checking link GPIO
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 3 Jan 2020 01:03:19 +0000 (17:03 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 5 Jan 2020 22:27:01 +0000 (14:27 -0800)
If we fail to locate GPIO for any reason other than deferral or
not-found-GPIO, we try to print device tree node info, however if might
be freed already as we called of_node_put() on it.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/fixed_phy.c

index 7c5265fd2b94d31f03ce61ce0f9505310d434f7b..4190f9ed5313d60c40890cb31f6ce2c94d456e7f 100644 (file)
@@ -212,16 +212,13 @@ static struct gpio_desc *fixed_phy_get_gpiod(struct device_node *np)
         */
        gpiod = gpiod_get_from_of_node(fixed_link_node, "link-gpios", 0,
                                       GPIOD_IN, "mdio");
-       of_node_put(fixed_link_node);
-       if (IS_ERR(gpiod)) {
-               if (PTR_ERR(gpiod) == -EPROBE_DEFER)
-                       return gpiod;
-
+       if (IS_ERR(gpiod) && PTR_ERR(gpiod) != -EPROBE_DEFER) {
                if (PTR_ERR(gpiod) != -ENOENT)
                        pr_err("error getting GPIO for fixed link %pOF, proceed without\n",
                               fixed_link_node);
                gpiod = NULL;
        }
+       of_node_put(fixed_link_node);
 
        return gpiod;
 }