lkml.org 
[lkml]   [2021]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 092/177] Revert "net: fujitsu: fix a potential NULL pointer dereference"
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    [ Upstream commit 5f94eaa4ee23e80841fa359a372f84cfe25daee1 ]

    This reverts commit 9f4d6358e11bbc7b839f9419636188e4151fb6e4.

    Because of recent interactions with developers from @umn.edu, all
    commits from them have been recently re-reviewed to ensure if they were
    correct or not.

    Upon review, this commit was found to be incorrect for the reasons
    below, so it must be reverted. It will be fixed up "correctly" in a
    later kernel change.

    The original change does not change any behavior as the caller of this
    function onlyu checks for "== -1" as an error condition so this error is
    not handled properly. Remove this change and it will be fixed up
    properly in a later commit.

    Cc: Kangjie Lu <kjlu@umn.edu>
    Cc: David S. Miller <davem@davemloft.net>
    Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Link: https://lore.kernel.org/r/20210503115736.2104747-15-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 deletions(-)

    diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
    index 1eca0fdb9933..a69cd19a55ae 100644
    --- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
    +++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
    @@ -547,11 +547,6 @@ 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 -ENOMEM;
    - }
    -
    pcmcia_map_mem_page(link, link->resource[2], 0);

    /*
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-31 17:44    [W:4.142 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site