lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 245/633] net: wilc1000: clean up resource in error path of init mon interface
    Date
    From: Huang Guobin <huangguobin4@huawei.com>

    [ Upstream commit 55bd149978679742374c800e56e8f6bc74378bbe ]

    The wilc_wfi_init_mon_int() forgets to clean up resource when
    register_netdevice() failed. Add the missed call to fix it.
    And the return value of netdev_priv can't be NULL, so remove
    the unnecessary error handling.

    Fixes: 588713006ea4 ("staging: wilc1000: avoid the use of 'wilc_wfi_mon' static variable")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Huang Guobin <huangguobin4@huawei.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20200917123019.206382-1-huangguobin4@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/wilc1000/mon.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/staging/wilc1000/mon.c b/drivers/staging/wilc1000/mon.c
    index 60331417bd983..66f1c870f4f69 100644
    --- a/drivers/staging/wilc1000/mon.c
    +++ b/drivers/staging/wilc1000/mon.c
    @@ -236,11 +236,10 @@ struct net_device *wilc_wfi_init_mon_interface(struct wilc *wl,

    if (register_netdevice(wl->monitor_dev)) {
    netdev_err(real_dev, "register_netdevice failed\n");
    + free_netdev(wl->monitor_dev);
    return NULL;
    }
    priv = netdev_priv(wl->monitor_dev);
    - if (!priv)
    - return NULL;

    priv->real_ndev = real_dev;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:13    [W:3.017 / U:0.804 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site