[PATCH 06/32] iwlwifi: calib: Prepare to use mem_to_flex_dup()

[Kees Cook <keescook@xxxxxxxxxxxx>]

In preparation for replacing an open-coded memcpy() of a dynamically
side buffer, rearrange the structures to pass enough information into
the calling function to examine the bounds of the struct.

Rearrange the argument passing to use "cmd", rather than "hdr", since
"res" expects to operate on the "data" flex array in "cmd" (that follows
"hdr").

Cc: Luca Coelho <luciano.coelho@xxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Jakub Kicinski <kuba@xxxxxxxxxx>
Cc: Lee Jones <lee.jones@xxxxxxxxxx>
Cc: Johannes Berg <johannes.berg@xxxxxxxxx>
Cc: Gregory Greenman <gregory.greenman@xxxxxxxxx>
Cc: Kalle Valo <kvalo@xxxxxxxxxx>
Cc: Eric Dumazet <edumazet@xxxxxxxxxx>
Cc: Paolo Abeni <pabeni@xxxxxxxxxx>
Cc: Andy Lavr <andy.lavr@xxxxxxxxx>
Cc: linux-wireless@xxxxxxxxxxxxxxx
Cc: netdev@xxxxxxxxxxxxxxx
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
---
 drivers/net/wireless/intel/iwlwifi/dvm/agn.h   |  2 +-
 drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 10 +++++-----
 drivers/net/wireless/intel/iwlwifi/dvm/ucode.c |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/agn.h 
b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h
index abb8696ba294..744e111d2ea3 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h
@@ -112,7 +112,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
                              enum iwl_ucode_type ucode_type);
 int iwl_send_calib_results(struct iwl_priv *priv);
 int iwl_calib_set(struct iwl_priv *priv,
-                 const struct iwl_calib_hdr *cmd, int len);
+                 const struct iwl_calib_cmd *cmd, int len);
 void iwl_calib_free_results(struct iwl_priv *priv);
 int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
                            char **buf);
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c 
b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c
index a11884fa254b..ae1f0cf560e2 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c
@@ -19,7 +19,7 @@
 struct iwl_calib_result {
        struct list_head list;
        size_t cmd_len;
-       struct iwl_calib_hdr hdr;
+       struct iwl_calib_cmd cmd;
        /* data follows */
 };
 
@@ -43,12 +43,12 @@ int iwl_send_calib_results(struct iwl_priv *priv)
                int ret;
 
                hcmd.len[0] = res->cmd_len;
-               hcmd.data[0] = &res->hdr;
+               hcmd.data[0] = &res->cmd;
                hcmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;
                ret = iwl_dvm_send_cmd(priv, &hcmd);
                if (ret) {
                        IWL_ERR(priv, "Error %d on calib cmd %d\n",
-                               ret, res->hdr.op_code);
+                               ret, res->cmd.hdr.op_code);
                        return ret;
                }
        }
@@ -57,7 +57,7 @@ int iwl_send_calib_results(struct iwl_priv *priv)
 }
 
 int iwl_calib_set(struct iwl_priv *priv,
-                 const struct iwl_calib_hdr *cmd, int len)
+                 const struct iwl_calib_cmd *cmd, int len)
 {
        struct iwl_calib_result *res, *tmp;
 
@@ -69,7 +69,7 @@ int iwl_calib_set(struct iwl_priv *priv,
        res->cmd_len = len;
 
        list_for_each_entry(tmp, &priv->calib_results, list) {
-               if (tmp->hdr.op_code == res->hdr.op_code) {
+               if (tmp->cmd.hdr.op_code == res->cmd.hdr.op_code) {
                        list_replace(&tmp->list, &res->list);
                        kfree(tmp);
                        return 0;
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c 
b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c
index 4b27a53d0bb4..bb13ca5d666c 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c
@@ -356,18 +356,18 @@ static bool iwlagn_wait_calib(struct iwl_notif_wait_data 
*notif_wait,
                              struct iwl_rx_packet *pkt, void *data)
 {
        struct iwl_priv *priv = data;
-       struct iwl_calib_hdr *hdr;
+       struct iwl_calib_cmd *cmd;
 
        if (pkt->hdr.cmd != CALIBRATION_RES_NOTIFICATION) {
                WARN_ON(pkt->hdr.cmd != CALIBRATION_COMPLETE_NOTIFICATION);
                return true;
        }
 
-       hdr = (struct iwl_calib_hdr *)pkt->data;
+       cmd = (struct iwl_calib_cmd *)pkt->data;
 
-       if (iwl_calib_set(priv, hdr, iwl_rx_packet_payload_len(pkt)))
+       if (iwl_calib_set(priv, cmd, iwl_rx_packet_payload_len(pkt)))
                IWL_ERR(priv, "Failed to record calibration data %d\n",
-                       hdr->op_code);
+                       cmd->hdr.op_code);
 
        return false;
 }
-- 
2.32.0