lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 067/434] libertas: fix a potential NULL pointer dereference
    Date
    From: Allen Pais <allen.pais@oracle.com>

    [ Upstream commit 7da413a18583baaf35dd4a8eb414fa410367d7f2 ]

    alloc_workqueue is not checked for errors and as a result,
    a potential NULL dereference could occur.

    Signed-off-by: Allen Pais <allen.pais@oracle.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/marvell/libertas/if_sdio.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c
    index 242d8845da3f..30f1025ecb9b 100644
    --- a/drivers/net/wireless/marvell/libertas/if_sdio.c
    +++ b/drivers/net/wireless/marvell/libertas/if_sdio.c
    @@ -1179,6 +1179,10 @@ static int if_sdio_probe(struct sdio_func *func,

    spin_lock_init(&card->lock);
    card->workqueue = alloc_workqueue("libertas_sdio", WQ_MEM_RECLAIM, 0);
    + if (unlikely(!card->workqueue)) {
    + ret = -ENOMEM;
    + goto err_queue;
    + }
    INIT_WORK(&card->packet_worker, if_sdio_host_to_card_worker);
    init_waitqueue_head(&card->pwron_waitq);

    @@ -1230,6 +1234,7 @@ err_activate_card:
    lbs_remove_card(priv);
    free:
    destroy_workqueue(card->workqueue);
    +err_queue:
    while (card->packets) {
    packet = card->packets;
    card->packets = card->packets->next;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 18:46    [W:2.079 / U:1.932 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site