lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 169/281] net: freescale: fix potential null pointer dereference
    Date
    From: "Gustavo A. R. Silva" <garsilva@embeddedor.com>

    [ Upstream commit 06d2d6431bc8d41ef5ffd8bd4b52cea9f72aed22 ]

    Add NULL check before dereferencing pointer _id_ in order to avoid
    a potential NULL pointer dereference.

    Addresses-Coverity-ID: 1397995
    Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/ethernet/freescale/fsl_pq_mdio.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
    index 446c7b374ff5..a10de1e9c157 100644
    --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
    +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
    @@ -381,7 +381,7 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev)
    {
    const struct of_device_id *id =
    of_match_device(fsl_pq_mdio_match, &pdev->dev);
    - const struct fsl_pq_mdio_data *data = id->data;
    + const struct fsl_pq_mdio_data *data;
    struct device_node *np = pdev->dev.of_node;
    struct resource res;
    struct device_node *tbi;
    @@ -389,6 +389,13 @@ static int fsl_pq_mdio_probe(struct platform_device *pdev)
    struct mii_bus *new_bus;
    int err;

    + if (!id) {
    + dev_err(&pdev->dev, "Failed to match device\n");
    + return -ENODEV;
    + }
    +
    + data = id->data;
    +
    dev_dbg(&pdev->dev, "found %s compatible node\n", id->compatible);

    new_bus = mdiobus_alloc_size(sizeof(*priv));
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 22:00    [W:4.979 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site