lkml.org 
[lkml]   [2018]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 091/190] libertas: check return value of alloc_workqueue
    Date
    From: Pan Bian <bianpan2016@163.com>

    [ Upstream commit dc3f89c38a8406554ffeffa370aad086a9c5e9de ]

    Function alloc_workqueue() will return a NULL pointer if there is no
    enough memory, and its return value should be validated before using.
    However, in function if_spi_probe(), its return value is not checked.
    This may result in a NULL dereference bug. This patch fixes the bug.

    Signed-off-by: Pan Bian <bianpan2016@163.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/wireless/marvell/libertas/if_spi.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c
    index c3a53cd6988e..7b4955cc38db 100644
    --- a/drivers/net/wireless/marvell/libertas/if_spi.c
    +++ b/drivers/net/wireless/marvell/libertas/if_spi.c
    @@ -1181,6 +1181,10 @@ static int if_spi_probe(struct spi_device *spi)

    /* Initialize interrupt handling stuff. */
    card->workqueue = alloc_workqueue("libertas_spi", WQ_MEM_RECLAIM, 0);
    + if (!card->workqueue) {
    + err = -ENOMEM;
    + goto remove_card;
    + }
    INIT_WORK(&card->packet_work, if_spi_host_to_card_worker);
    INIT_WORK(&card->resume_work, if_spi_resume_worker);

    @@ -1209,6 +1213,7 @@ static int if_spi_probe(struct spi_device *spi)
    free_irq(spi->irq, card);
    terminate_workqueue:
    destroy_workqueue(card->workqueue);
    +remove_card:
    lbs_remove_card(priv); /* will call free_netdev */
    free_card:
    free_if_spi_card(card);
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-08 07:10    [W:4.085 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site