From: Claudiu Beznea <Claudiu.Beznea@microchip.com>
To: Colin King <colin.king@canonical.com>,
Aditya Shankar <aditya.shankar@microchip.com>,
Ganesh Krishna <ganesh.krishna@microchip.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<linux-wireless@vger.kernel.org>, <devel@driverdev.osuosl.org>
Cc: <kernel-janitors@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] staging: wilc1000: fix null checks on wilc
Date: Wed, 12 Sep 2018 10:43:46 +0300 [thread overview]
Message-ID: <d6520e83-68d4-1c32-5291-74163b74e249@microchip.com> (raw)
In-Reply-To: <20180911173851.17567-1-colin.king@canonical.com>
On 11.09.2018 20:38, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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>
> ---
> drivers/staging/wilc1000/linux_wlan.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
> index a498321c908b..49afda669393 100644
> --- a/drivers/staging/wilc1000/linux_wlan.c
> +++ b/drivers/staging/wilc1000/linux_wlan.c
> @@ -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)
>
prev parent reply other threads:[~2018-09-12 7:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 17:38 Colin King
2018-09-12 7:43 ` Claudiu Beznea [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d6520e83-68d4-1c32-5291-74163b74e249@microchip.com \
--to=claudiu.beznea@microchip.com \
--cc=aditya.shankar@microchip.com \
--cc=colin.king@canonical.com \
--cc=devel@driverdev.osuosl.org \
--cc=ganesh.krishna@microchip.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®