From: David Spinadel Date: Mon, 2 Jun 2014 06:59:49 +0000 (+0300) Subject: iwlwifi: mvm: use ksize to memset scan_command X-Git-Tag: Ubuntu-5.10.0-12.13~16489^2~210^2~74 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0564679bb6e750dc6d441f6d67e95c0590fa3f80;p=mirror_ubuntu-hirsute-kernel.git iwlwifi: mvm: use ksize to memset scan_command Use ksize to get scan command size instead of calculating it, to avoid nasty bugs. Signed-off-by: David Spinadel Signed-off-by: Emmanuel Grumbach --- diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index 4b6c7d4bd199..df8f3ebea84a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c @@ -325,9 +325,7 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm, IWL_DEBUG_SCAN(mvm, "Handling mac80211 scan request\n"); mvm->scan_status = IWL_MVM_SCAN_OS; - memset(cmd, 0, sizeof(struct iwl_scan_cmd) + - mvm->fw->ucode_capa.max_probe_length + - (MAX_NUM_SCAN_CHANNELS * sizeof(struct iwl_scan_channel))); + memset(cmd, 0, ksize(cmd)); cmd->channel_count = (u8)req->n_channels; cmd->quiet_time = cpu_to_le16(IWL_ACTIVE_QUIET_TIME);