summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex
diff options
context:
space:
mode:
authorBing Zhao2013-03-07 01:44:26 +0100
committerJohn W. Linville2013-03-08 22:02:48 +0100
commitc678fb2a915b71f8faa78d9ab6d409b8ff3276cc (patch)
tree074b9864a203dfaf139d9c9e65ca02bdb594c14f /drivers/net/wireless/mwifiex
parentmwifiex: Trigger a card reset on reaching tx_timeout threshold (diff)
downloadkernel-qcow2-linux-c678fb2a915b71f8faa78d9ab6d409b8ff3276cc.tar.gz
kernel-qcow2-linux-c678fb2a915b71f8faa78d9ab6d409b8ff3276cc.tar.xz
kernel-qcow2-linux-c678fb2a915b71f8faa78d9ab6d409b8ff3276cc.zip
mwifiex: fix potential null dereference 'mef_entry'
drivers/net/wireless/mwifiex/cfg80211.c:2357 mwifiex_cfg80211_suspend() error: potential null dereference 'mef_entry' (kzalloc returns null) Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r--drivers/net/wireless/mwifiex/cfg80211.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index df30107225f8..c9bc5f5ba6e1 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -2350,9 +2350,12 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,
return 0;
}
+ mef_entry = kzalloc(sizeof(*mef_entry), GFP_KERNEL);
+ if (!mef_entry)
+ return -ENOMEM;
+
memset(&mef_cfg, 0, sizeof(mef_cfg));
mef_cfg.num_entries = 1;
- mef_entry = kzalloc(sizeof(*mef_entry), GFP_KERNEL);
mef_cfg.mef_entry = mef_entry;
mef_entry->mode = MEF_MODE_HOST_SLEEP;
mef_entry->action = MEF_ACTION_ALLOW_AND_WAKEUP_HOST;