Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1367065 > unrolled thread
| Started by | Wei-Ning Huang <wnhuang@chromium.org> |
|---|---|
| First post | 2016-03-30 12:10 +0200 |
| Last post | 2016-03-30 12:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] CHROMIUM: mwifiex: fix NULL pointer dereference error Wei-Ning Huang <wnhuang@chromium.org> - 2016-03-30 12:10 +0200
Re: [PATCH] CHROMIUM: mwifiex: fix NULL pointer dereference error Wei-Ning Huang <wnhuang@google.com> - 2016-03-30 12:10 +0200
| From | Wei-Ning Huang <wnhuang@chromium.org> |
|---|---|
| Date | 2016-03-30 12:10 +0200 |
| Subject | [PATCH] CHROMIUM: mwifiex: fix NULL pointer dereference error |
| Message-ID | <riley-3Ki-1@gated-at.bofh.it> |
In mwifiex_enable_hs, we need to check if
priv->wdev.wiphy->wowlan_config is NULL before accessing it's member.
This sometimes cause kernel panic when suspend/resume.
Signed-off-by: Wei-Ning Huang <wnhuang@chromium.org>
---
drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
index d5c56eb..d8de432 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
@@ -509,7 +509,8 @@ int mwifiex_enable_hs(struct mwifiex_adapter *adapter)
if (priv && priv->sched_scanning) {
#ifdef CONFIG_PM
- if (!priv->wdev.wiphy->wowlan_config->nd_config) {
+ if (priv->wdev.wiphy->wowlan_config &&
+ !priv->wdev.wiphy->wowlan_config->nd_config) {
#endif
mwifiex_dbg(adapter, CMD, "aborting bgscan!\n");
mwifiex_stop_bg_scan(priv);
--
2.1.2
[toc] | [next] | [standalone]
| From | Wei-Ning Huang <wnhuang@google.com> |
|---|---|
| Date | 2016-03-30 12:10 +0200 |
| Message-ID | <rilez-3Ki-17@gated-at.bofh.it> |
| In reply to | #1367065 |
Sorry, please ignore this one. I forgot to strip the CHROMIUM: tag.
Wei-Ning
On Wed, Mar 30, 2016 at 6:08 PM, Wei-Ning Huang <wnhuang@chromium.org> wrote:
> In mwifiex_enable_hs, we need to check if
> priv->wdev.wiphy->wowlan_config is NULL before accessing it's member.
> This sometimes cause kernel panic when suspend/resume.
>
> Signed-off-by: Wei-Ning Huang <wnhuang@chromium.org>
> ---
> drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> index d5c56eb..d8de432 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
> @@ -509,7 +509,8 @@ int mwifiex_enable_hs(struct mwifiex_adapter *adapter)
>
> if (priv && priv->sched_scanning) {
> #ifdef CONFIG_PM
> - if (!priv->wdev.wiphy->wowlan_config->nd_config) {
> + if (priv->wdev.wiphy->wowlan_config &&
> + !priv->wdev.wiphy->wowlan_config->nd_config) {
> #endif
> mwifiex_dbg(adapter, CMD, "aborting bgscan!\n");
> mwifiex_stop_bg_scan(priv);
> --
> 2.1.2
>
--
Wei-Ning Huang, 黃偉寧 | Software Engineer, Google Inc., Taiwan |
wnhuang@google.com | Cell: +886 910-380678
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web