aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intersil/orinoco/orinoco.h
diff options
context:
space:
mode:
authorAndrew Lutomirski <luto@kernel.org>2016-12-12 12:55:55 -0800
committerKalle Valo <kvalo@codeaurora.org>2016-12-30 13:34:15 +0200
commit1fef293b8a9850cfa124a53c1d8878d355010403 (patch)
tree083d21f7851a93934ab47b4581f174ee06c4bdb0 /drivers/net/wireless/intersil/orinoco/orinoco.h
parentadm80211: return an error if adm8211_alloc_rings() fails (diff)
downloadlinux-dev-1fef293b8a9850cfa124a53c1d8878d355010403.tar.xz
linux-dev-1fef293b8a9850cfa124a53c1d8878d355010403.zip
orinoco: Use shash instead of ahash for MIC calculations
Eric Biggers pointed out that the orinoco driver pointed scatterlists at the stack. Fix it by switching from ahash to shash. The result should be simpler, faster, and more correct. Cc: stable@vger.kernel.org # 4.9 only Reported-by: Eric Biggers <ebiggers3@gmail.com> Signed-off-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to '')
-rw-r--r--drivers/net/wireless/intersil/orinoco/orinoco.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intersil/orinoco/orinoco.h b/drivers/net/wireless/intersil/orinoco/orinoco.h
index 2f0c84b1c440..5fa1c3e3713f 100644
--- a/drivers/net/wireless/intersil/orinoco/orinoco.h
+++ b/drivers/net/wireless/intersil/orinoco/orinoco.h
@@ -152,8 +152,8 @@ struct orinoco_private {
u8 *wpa_ie;
int wpa_ie_len;
- struct crypto_ahash *rx_tfm_mic;
- struct crypto_ahash *tx_tfm_mic;
+ struct crypto_shash *rx_tfm_mic;
+ struct crypto_shash *tx_tfm_mic;
unsigned int wpa_enabled:1;
unsigned int tkip_cm_active:1;