lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0447/1017] ray_cs: Check ioremap return value
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    [ Upstream commit 7e4760713391ee46dc913194b33ae234389a174e ]

    As the possible failure of the ioremap(), the 'local->sram' and other
    two could be NULL.
    Therefore it should be better to check it in order to avoid the later
    dev_dbg.

    Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
    Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
    Signed-off-by: Kalle Valo <kvalo@kernel.org>
    Link: https://lore.kernel.org/r/20211230022926.1846757-1-jiasheng@iscas.ac.cn
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ray_cs.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
    index e3a3dc3e45b4..03f0953440b5 100644
    --- a/drivers/net/wireless/ray_cs.c
    +++ b/drivers/net/wireless/ray_cs.c
    @@ -382,6 +382,8 @@ static int ray_config(struct pcmcia_device *link)
    goto failed;
    local->sram = ioremap(link->resource[2]->start,
    resource_size(link->resource[2]));
    + if (!local->sram)
    + goto failed;

    /*** Set up 16k window for shared memory (receive buffer) ***************/
    link->resource[3]->flags |=
    @@ -396,6 +398,8 @@ static int ray_config(struct pcmcia_device *link)
    goto failed;
    local->rmem = ioremap(link->resource[3]->start,
    resource_size(link->resource[3]));
    + if (!local->rmem)
    + goto failed;

    /*** Set up window for attribute memory ***********************************/
    link->resource[4]->flags |=
    @@ -410,6 +414,8 @@ static int ray_config(struct pcmcia_device *link)
    goto failed;
    local->amem = ioremap(link->resource[4]->start,
    resource_size(link->resource[4]));
    + if (!local->amem)
    + goto failed;

    dev_dbg(&link->dev, "ray_config sram=%p\n", local->sram);
    dev_dbg(&link->dev, "ray_config rmem=%p\n", local->rmem);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 15:13    [W:4.881 / U:0.508 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site