lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 233/238] net: dsa: lantiq_gswip: fix use-after-free on failed probe
    Date
    5.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>

    commit aed13f2e00ce278f039b76e7ac84d419aff48ef6 upstream.

    Make sure to disable and deregister the switch on late probe errors to
    avoid use-after-free when the device-resource-managed switch is freed.

    Fixes: 14fceff4771e ("net: dsa: Add Lantiq / Intel DSA driver for vrx200")
    Cc: stable <stable@vger.kernel.org> # 4.20
    Cc: Hauke Mehrtens <hauke@hauke-m.de>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/dsa/lantiq_gswip.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/net/dsa/lantiq_gswip.c
    +++ b/drivers/net/dsa/lantiq_gswip.c
    @@ -1099,7 +1099,7 @@ static int gswip_probe(struct platform_d
    dev_err(dev, "wrong CPU port defined, HW only supports port: %i",
    priv->hw_info->cpu_port);
    err = -EINVAL;
    - goto mdio_bus;
    + goto disable_switch;
    }

    platform_set_drvdata(pdev, priv);
    @@ -1109,6 +1109,9 @@ static int gswip_probe(struct platform_d
    (version & GSWIP_VERSION_MOD_MASK) >> GSWIP_VERSION_MOD_SHIFT);
    return 0;

    +disable_switch:
    + gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);
    + dsa_unregister_switch(priv->ds);
    mdio_bus:
    if (mdio_np)
    mdiobus_unregister(priv->ds->slave_mii_bus);

    \
     
     \ /
      Last update: 2019-03-22 13:26    [W:4.121 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site