]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: wilc1000: clean up resource in error path of init mon interface
authorHuang Guobin <huangguobin4@huawei.com>
Thu, 17 Sep 2020 12:30:19 +0000 (08:30 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:41 +0000 (10:07 +0100)
[ 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

index 60331417bd9839b3a08827c9917a8b8da4f79b82..66f1c870f4f6996b54170c685d2d579845d65cb1 100644 (file)
@@ -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;