lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 701/717] memory: jz4780_nemc: Fix an error pointer vs NULL check in probe()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 96999c797ec1ef41259f00b4ddf9cf33b342cb78 upstream.

    The devm_ioremap() function returns NULL on error, it doesn't return
    error pointers. This bug could lead to an Oops during probe.

    Fixes: f046e4a3f0b9 ("memory: jz4780_nemc: Only request IO memory the driver will use")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Paul Cercueil <paul@crapouillou.net>
    Link: https://lore.kernel.org/r/20200803143607.GC346925@mwanda
    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/memory/jz4780-nemc.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/memory/jz4780-nemc.c
    +++ b/drivers/memory/jz4780-nemc.c
    @@ -306,9 +306,9 @@ static int jz4780_nemc_probe(struct plat
    }

    nemc->base = devm_ioremap(dev, res->start, NEMC_REG_LEN);
    - if (IS_ERR(nemc->base)) {
    + if (!nemc->base) {
    dev_err(dev, "failed to get I/O memory\n");
    - return PTR_ERR(nemc->base);
    + return -ENOMEM;
    }

    writel(0, nemc->base + NEMC_NFCSR);

    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:3.575 / U:1.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site