diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-04-16 15:46:41 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-16 15:47:15 -0400 |
| commit | eb2ec0fb3c2fe85d42b2d5131e526daa0e298b9e (patch) | |
| tree | d40bf385d54cd7899543dbbac1518d0b34762665 /drivers/net/wireless/iwlwifi | |
| parent | a02a2956809d88b42b9a1f8003d60a343353b5ea (diff) | |
| download | blackbird-op-linux-eb2ec0fb3c2fe85d42b2d5131e526daa0e298b9e.tar.gz blackbird-op-linux-eb2ec0fb3c2fe85d42b2d5131e526daa0e298b9e.zip | |
iwlwifi: check scan request ie_len
In mac80211 we always check both scan_req->ie and scan_req->ie_len
against zero before usage, in iwlwifi we should do the same.
Remove not needed "left -= ie_len" while at it.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index d817c9c184a5..83e62917e0bf 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -644,10 +644,10 @@ u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, if (WARN_ON(left < ie_len)) return len; - if (ies) + if (ies && ie_len) { memcpy(pos, ies, ie_len); - len += ie_len; - left -= ie_len; + len += ie_len; + } return (u16)len; } |
