From: Jouni Malinen Date: Sat, 4 Feb 2017 11:59:22 +0000 (+0200) Subject: mac80211: Fix FILS AEAD protection in Association Request frame X-Git-Tag: v4.14-rc1~1574^2~10^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e479ab651f071dbd1518ce8fb121c7f42f2bb97d;p=platform%2Fkernel%2Flinux-rpi3.git mac80211: Fix FILS AEAD protection in Association Request frame Incorrect num_elem parameter value (1 vs. 5) was used in the aes_siv_encrypt() call. This resulted in only the first one of the five AAD vectors to SIV getting included in calculation. This does not protect all the contents correctly and would not interoperate with a standard compliant implementation. Fix this by using the correct number. A matching fix is needed in the AP side (hostapd) to get FILS authentication working properly. Fixes: 39404feee691 ("mac80211: FILS AEAD protection for station mode association frames") Reported-by: Ard Biesheuvel Signed-off-by: Jouni Malinen Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/fils_aead.c b/net/mac80211/fils_aead.c index ecfdd97..e795aaa 100644 --- a/net/mac80211/fils_aead.c +++ b/net/mac80211/fils_aead.c @@ -272,7 +272,7 @@ int fils_encrypt_assoc_req(struct sk_buff *skb, crypt_len = skb->data + skb->len - encr; skb_put(skb, AES_BLOCK_SIZE); return aes_siv_encrypt(assoc_data->fils_kek, assoc_data->fils_kek_len, - encr, crypt_len, 1, addr, len, encr); + encr, crypt_len, 5, addr, len, encr); } int fils_decrypt_assoc_resp(struct ieee80211_sub_if_data *sdata,