aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2009-10-16 01:18:55 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:48:26 -0400
commit708567e0723f3a217286c2b60805af6de360ec50 (patch)
tree7ae30ebce5cf1fcdee80ce985ad1272ef3e82342 /drivers/net/wireless/iwmc3200wifi
parentf96cca8483c1b0bcc8002dc466159bf8fd53ca47 (diff)
iwmc3200wifi: Check for cmd pointer before dereferencing it
The wifi_if_wrapper notification handling code uses a cmd pointer without checking if it's valid or not. We're dereferencing it because we assume that we only get to that point if there was a pending command for us. That's not always true, so we'd better check. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/rx.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 225b1d3b2735..648f84a83705 100644
--- a/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -1057,8 +1057,14 @@ static int iwm_ntf_wifi_if_wrapper(struct iwm_priv *iwm, u8 *buf,
1057 unsigned long buf_size, 1057 unsigned long buf_size,
1058 struct iwm_wifi_cmd *cmd) 1058 struct iwm_wifi_cmd *cmd)
1059{ 1059{
1060 struct iwm_umac_wifi_if *hdr = 1060 struct iwm_umac_wifi_if *hdr;
1061 (struct iwm_umac_wifi_if *)cmd->buf.payload; 1061
1062 if (cmd == NULL) {
1063 IWM_ERR(iwm, "Couldn't find expected wifi command\n");
1064 return -EINVAL;
1065 }
1066
1067 hdr = (struct iwm_umac_wifi_if *)cmd->buf.payload;
1062 1068
1063 IWM_DBG_NTF(iwm, DBG, "WIFI_IF_WRAPPER cmd is delivered to UMAC: " 1069 IWM_DBG_NTF(iwm, DBG, "WIFI_IF_WRAPPER cmd is delivered to UMAC: "
1064 "oid is 0x%x\n", hdr->oid); 1070 "oid is 0x%x\n", hdr->oid);