lkml.org 
[lkml]   [2021]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 03/19] net: fujitsu: fix potential null-ptr-deref
    Date
    From: Anirudh Rayabharam <mail@anirudhrb.com>

    [ Upstream commit 52202be1cd996cde6e8969a128dc27ee45a7cb5e ]

    In fmvj18x_get_hwinfo(), if ioremap fails there will be NULL pointer
    deref. To fix this, check the return value of ioremap and return -1
    to the caller in case of failure.

    Cc: "David S. Miller" <davem@davemloft.net>
    Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Anirudh Rayabharam <mail@anirudhrb.com>
    Link: https://lore.kernel.org/r/20210503115736.2104747-16-gregkh@linuxfoundation.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
    index 399cfd217288..cfda55bfa811 100644
    --- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
    +++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
    @@ -548,6 +548,11 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)
    return -1;

    base = ioremap(link->resource[2]->start, resource_size(link->resource[2]));
    + if (!base) {
    + pcmcia_release_window(link, link->resource[2]);
    + return -1;
    + }
    +
    pcmcia_map_mem_page(link, link->resource[2], 0);

    /*
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-05-24 17:21    [W:4.186 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site