Commit b4a01d8f authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman

staging: wilc1000: fix null checks on wilc

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: b3ee105c ("staging: wilc1000: refactor code to move initilization in wilc_netdev_init()")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b55dce8
...@@ -1015,15 +1015,18 @@ void wilc_netdev_cleanup(struct wilc *wilc) ...@@ -1015,15 +1015,18 @@ void wilc_netdev_cleanup(struct wilc *wilc)
{ {
int i; 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); unregister_inetaddr_notifier(&g_dev_notifier);
if (wilc && wilc->firmware) { if (wilc->firmware) {
release_firmware(wilc->firmware); release_firmware(wilc->firmware);
wilc->firmware = NULL; 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++) for (i = 0; i < NUM_CONCURRENT_IFC; i++)
if (wilc->vif[i]->ndev) if (wilc->vif[i]->ndev)
if (wilc->vif[i]->mac_opened) if (wilc->vif[i]->mac_opened)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment