iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: wilc1000: fix null checks on wilc

Browse Source 
Currently the pointer wilc is being null checked several times
and yet not checked for the final workqueue flush and destroy
(which can lead to a null pointer dereference if wilc is null);
these missing null checks were overlooked in an earlier core
refactoring commit.

Clean up the code by checking wilc at the start and bailing out
early if it is null allowing the subsequent null checks to be
removed, this also fixes the potential null pointer deferences
on the workqueue flush and destroy calls.

Detected by CoverityScan, CID#1473305 ("Dereference after null check")

Fixes: b3ee105c332e ("staging: wilc1000: refactor code to move initilization in wilc_netdev_init()")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Colin Ian King 2018-09-11 18:38:51 +01:00 committed by Greg Kroah-Hartman
parent 4b55dce8b0
commit b4a01d8fa3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/wilc1000/linux_wlan.c
View File

@ -1015,15 +1015,18 @@ void wilc_netdev_cleanup(struct wilc *wilc)
{
int i;
if (wilc && (wilc->vif[0]->ndev || wilc->vif[1]->ndev))
if (!wilc)
return;
if (wilc->vif[0]->ndev || wilc->vif[1]->ndev)
unregister_inetaddr_notifier(&g_dev_notifier);
if (wilc && wilc->firmware) {
if (wilc->firmware) {
release_firmware(wilc->firmware);
wilc->firmware = NULL;
}
if (wilc && (wilc->vif[0]->ndev || wilc->vif[1]->ndev)) {
if (wilc->vif[0]->ndev || wilc->vif[1]->ndev) {
for (i = 0; i < NUM_CONCURRENT_IFC; i++)
if (wilc->vif[i]->ndev)
if (wilc->vif[i]->mac_opened)