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>

diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 225b1d3b27359c6ff6f7a81bcadd9708036c8fb9..648f84a83705e5ff71f824e6670384c108c260e4 100644 (file)
--- 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,
                                   unsigned long buf_size,
                                   struct iwm_wifi_cmd *cmd)
 {
-       struct iwm_umac_wifi_if *hdr =
-                       (struct iwm_umac_wifi_if *)cmd->buf.payload;
+       struct iwm_umac_wifi_if *hdr;
+
+       if (cmd == NULL) {
+               IWM_ERR(iwm, "Couldn't find expected wifi command\n");
+               return -EINVAL;
+       }
+
+       hdr = (struct iwm_umac_wifi_if *)cmd->buf.payload;
 
        IWM_DBG_NTF(iwm, DBG, "WIFI_IF_WRAPPER cmd is delivered to UMAC: "
                    "oid is 0x%x\n", hdr->oid);