From: Arend van Spriel <arend@broadcom.com>
To: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: <linux-wireless@vger.kernel.org>,
Brett Rudley <brudley@broadcom.com>,
Hante Meuleman <meuleman@broadcom.com>,
Kalle Valo <kvalo@codeaurora.org>,
"John W. Linville" <linville@tuxdriver.com>,
Christophe Prigent <christophe.prigent@intel.com>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] brcmfmac: Do not crash if platform data is not populated
Date: Tue, 23 Dec 2014 16:37:21 +0100 [thread overview]
Message-ID: <54998C31.9090500@broadcom.com> (raw)
In-Reply-To: <1419346112-173303-1-git-send-email-mika.westerberg@linux.intel.com>
On 12/23/14 15:48, Mika Westerberg wrote:
> The driver looks for pdata->oob_irq_supported to find out if wowl can be
> supported. However, not all platforms populate pdata in which case we crash
> the kernel because of NULL pointer dereference.
Thanks, Mika
However, this was already reported by Dan Carpenter and I submitted a
patch for that a couple of days ago: "[PATCH 02/10] brcmfmac: Fix
possible dereference of NULL pointer." [1].
Regards,
Arend
[1]
http://mid.gmane.org/1419162233-19492-3-git-send-email-arend@broadcom.com
> Fixes: 330b4e4be937 ("brcmfmac: Add wowl support for SDIO devices.")
> Reported-by: Christophe Prigent<christophe.prigent@intel.com>
> Signed-off-by: Mika Westerberg<mika.westerberg@linux.intel.com>
> ---
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> index 3c06e9365949..9880dae2a569 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> @@ -1070,7 +1070,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
> */
> if ((sdio_get_host_pm_caps(sdiodev->func[1])& MMC_PM_KEEP_POWER)&&
> ((sdio_get_host_pm_caps(sdiodev->func[1])& MMC_PM_WAKE_SDIO_IRQ) ||
> - (sdiodev->pdata->oob_irq_supported)))
> + (sdiodev->pdata&& sdiodev->pdata->oob_irq_supported)))
> bus_if->wowl_supported = true;
> #endif
>
> @@ -1167,7 +1167,7 @@ static int brcmf_ops_sdio_resume(struct device *dev)
> struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
>
> brcmf_dbg(SDIO, "Enter\n");
> - if (sdiodev->pdata->oob_irq_supported)
> + if (sdiodev->pdata&& sdiodev->pdata->oob_irq_supported)
> disable_irq_wake(sdiodev->pdata->oob_irq_nr);
> brcmf_sdio_wd_timer(sdiodev->bus, BRCMF_WD_POLL_MS);
> atomic_set(&sdiodev->suspend, false);
next prev parent reply other threads:[~2014-12-23 15:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-23 14:48 [PATCH] brcmfmac: Do not crash if platform data is not populated Mika Westerberg
2014-12-23 15:37 ` Arend van Spriel [this message]
2014-12-23 15:47 ` Mika Westerberg
2014-12-23 15:59 ` Arend van Spriel
2014-12-23 17:00 ` Kalle Valo
2014-12-23 17:33 ` Arend van Spriel
2014-12-24 13:29 ` Kalle Valo
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=54998C31.9090500@broadcom.com \
--to=arend@broadcom.com \
--cc=brudley@broadcom.com \
--cc=christophe.prigent@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=meuleman@broadcom.com \
--cc=mika.westerberg@linux.intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.