1 // SPDX-License-Identifier: GPL-2.0-only 1 // SPDX-License-Identifier: GPL-2.0-only
2 /* 2 /*
3 * Copyright 2002-2004, Instant802 Networks, I 3 * Copyright 2002-2004, Instant802 Networks, Inc.
4 * Copyright 2008, Jouni Malinen <j@w1.fi> 4 * Copyright 2008, Jouni Malinen <j@w1.fi>
5 * Copyright (C) 2016-2017 Intel Deutschland G 5 * Copyright (C) 2016-2017 Intel Deutschland GmbH
6 * Copyright (C) 2020-2023 Intel Corporation 6 * Copyright (C) 2020-2023 Intel Corporation
7 */ 7 */
8 8
9 #include <linux/netdevice.h> 9 #include <linux/netdevice.h>
10 #include <linux/types.h> 10 #include <linux/types.h>
11 #include <linux/skbuff.h> 11 #include <linux/skbuff.h>
12 #include <linux/compiler.h> 12 #include <linux/compiler.h>
13 #include <linux/ieee80211.h> 13 #include <linux/ieee80211.h>
14 #include <linux/gfp.h> 14 #include <linux/gfp.h>
15 #include <linux/unaligned.h> !! 15 #include <asm/unaligned.h>
16 #include <net/mac80211.h> 16 #include <net/mac80211.h>
17 #include <crypto/aes.h> 17 #include <crypto/aes.h>
18 #include <crypto/utils.h> 18 #include <crypto/utils.h>
19 19
20 #include "ieee80211_i.h" 20 #include "ieee80211_i.h"
21 #include "michael.h" 21 #include "michael.h"
22 #include "tkip.h" 22 #include "tkip.h"
23 #include "aes_ccm.h" 23 #include "aes_ccm.h"
24 #include "aes_cmac.h" 24 #include "aes_cmac.h"
25 #include "aes_gmac.h" 25 #include "aes_gmac.h"
26 #include "aes_gcm.h" 26 #include "aes_gcm.h"
27 #include "wpa.h" 27 #include "wpa.h"
28 28
29 ieee80211_tx_result 29 ieee80211_tx_result
30 ieee80211_tx_h_michael_mic_add(struct ieee8021 30 ieee80211_tx_h_michael_mic_add(struct ieee80211_tx_data *tx)
31 { 31 {
32 u8 *data, *key, *mic; 32 u8 *data, *key, *mic;
33 size_t data_len; 33 size_t data_len;
34 unsigned int hdrlen; 34 unsigned int hdrlen;
35 struct ieee80211_hdr *hdr; 35 struct ieee80211_hdr *hdr;
36 struct sk_buff *skb = tx->skb; 36 struct sk_buff *skb = tx->skb;
37 struct ieee80211_tx_info *info = IEEE8 37 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
38 int tail; 38 int tail;
39 39
40 hdr = (struct ieee80211_hdr *)skb->dat 40 hdr = (struct ieee80211_hdr *)skb->data;
41 if (!tx->key || tx->key->conf.cipher ! 41 if (!tx->key || tx->key->conf.cipher != WLAN_CIPHER_SUITE_TKIP ||
42 skb->len < 24 || !ieee80211_is_dat 42 skb->len < 24 || !ieee80211_is_data_present(hdr->frame_control))
43 return TX_CONTINUE; 43 return TX_CONTINUE;
44 44
45 hdrlen = ieee80211_hdrlen(hdr->frame_c 45 hdrlen = ieee80211_hdrlen(hdr->frame_control);
46 if (skb->len < hdrlen) 46 if (skb->len < hdrlen)
47 return TX_DROP; 47 return TX_DROP;
48 48
49 data = skb->data + hdrlen; 49 data = skb->data + hdrlen;
50 data_len = skb->len - hdrlen; 50 data_len = skb->len - hdrlen;
51 51
52 if (unlikely(info->flags & IEEE80211_T 52 if (unlikely(info->flags & IEEE80211_TX_INTFL_TKIP_MIC_FAILURE)) {
53 /* Need to use software crypto 53 /* Need to use software crypto for the test */
54 info->control.hw_key = NULL; 54 info->control.hw_key = NULL;
55 } 55 }
56 56
57 if (info->control.hw_key && 57 if (info->control.hw_key &&
58 (info->flags & IEEE80211_TX_CTL_DO 58 (info->flags & IEEE80211_TX_CTL_DONTFRAG ||
59 ieee80211_hw_check(&tx->local->hw 59 ieee80211_hw_check(&tx->local->hw, SUPPORTS_TX_FRAG)) &&
60 !(tx->key->conf.flags & (IEEE80211 60 !(tx->key->conf.flags & (IEEE80211_KEY_FLAG_GENERATE_MMIC |
61 IEEE80211 61 IEEE80211_KEY_FLAG_PUT_MIC_SPACE))) {
62 /* hwaccel - with no need for 62 /* hwaccel - with no need for SW-generated MMIC or MIC space */
63 return TX_CONTINUE; 63 return TX_CONTINUE;
64 } 64 }
65 65
66 tail = MICHAEL_MIC_LEN; 66 tail = MICHAEL_MIC_LEN;
67 if (!info->control.hw_key) 67 if (!info->control.hw_key)
68 tail += IEEE80211_TKIP_ICV_LEN 68 tail += IEEE80211_TKIP_ICV_LEN;
69 69
70 if (WARN(skb_tailroom(skb) < tail || 70 if (WARN(skb_tailroom(skb) < tail ||
71 skb_headroom(skb) < IEEE80211 71 skb_headroom(skb) < IEEE80211_TKIP_IV_LEN,
72 "mmic: not enough head/tail ( 72 "mmic: not enough head/tail (%d/%d,%d/%d)\n",
73 skb_headroom(skb), IEEE80211_ 73 skb_headroom(skb), IEEE80211_TKIP_IV_LEN,
74 skb_tailroom(skb), tail)) 74 skb_tailroom(skb), tail))
75 return TX_DROP; 75 return TX_DROP;
76 76
77 mic = skb_put(skb, MICHAEL_MIC_LEN); 77 mic = skb_put(skb, MICHAEL_MIC_LEN);
78 78
79 if (tx->key->conf.flags & IEEE80211_KE 79 if (tx->key->conf.flags & IEEE80211_KEY_FLAG_PUT_MIC_SPACE) {
80 /* Zeroed MIC can help with de 80 /* Zeroed MIC can help with debug */
81 memset(mic, 0, MICHAEL_MIC_LEN 81 memset(mic, 0, MICHAEL_MIC_LEN);
82 return TX_CONTINUE; 82 return TX_CONTINUE;
83 } 83 }
84 84
85 key = &tx->key->conf.key[NL80211_TKIP_ 85 key = &tx->key->conf.key[NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY];
86 michael_mic(key, hdr, data, data_len, 86 michael_mic(key, hdr, data, data_len, mic);
87 if (unlikely(info->flags & IEEE80211_T 87 if (unlikely(info->flags & IEEE80211_TX_INTFL_TKIP_MIC_FAILURE))
88 mic[0]++; 88 mic[0]++;
89 89
90 return TX_CONTINUE; 90 return TX_CONTINUE;
91 } 91 }
92 92
93 93
94 ieee80211_rx_result 94 ieee80211_rx_result
95 ieee80211_rx_h_michael_mic_verify(struct ieee8 95 ieee80211_rx_h_michael_mic_verify(struct ieee80211_rx_data *rx)
96 { 96 {
97 u8 *data, *key = NULL; 97 u8 *data, *key = NULL;
98 size_t data_len; 98 size_t data_len;
99 unsigned int hdrlen; 99 unsigned int hdrlen;
100 u8 mic[MICHAEL_MIC_LEN]; 100 u8 mic[MICHAEL_MIC_LEN];
101 struct sk_buff *skb = rx->skb; 101 struct sk_buff *skb = rx->skb;
102 struct ieee80211_rx_status *status = I 102 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
103 struct ieee80211_hdr *hdr = (struct ie 103 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
104 104
105 /* 105 /*
106 * it makes no sense to check for MIC 106 * it makes no sense to check for MIC errors on anything other
107 * than data frames. 107 * than data frames.
108 */ 108 */
109 if (!ieee80211_is_data_present(hdr->fr 109 if (!ieee80211_is_data_present(hdr->frame_control))
110 return RX_CONTINUE; 110 return RX_CONTINUE;
111 111
112 /* 112 /*
113 * No way to verify the MIC if the har 113 * No way to verify the MIC if the hardware stripped it or
114 * the IV with the key index. In this 114 * the IV with the key index. In this case we have solely rely
115 * on the driver to set RX_FLAG_MMIC_E 115 * on the driver to set RX_FLAG_MMIC_ERROR in the event of a
116 * MIC failure report. 116 * MIC failure report.
117 */ 117 */
118 if (status->flag & (RX_FLAG_MMIC_STRIP 118 if (status->flag & (RX_FLAG_MMIC_STRIPPED | RX_FLAG_IV_STRIPPED)) {
119 if (status->flag & RX_FLAG_MMI 119 if (status->flag & RX_FLAG_MMIC_ERROR)
120 goto mic_fail_no_key; 120 goto mic_fail_no_key;
121 121
122 if (!(status->flag & RX_FLAG_I 122 if (!(status->flag & RX_FLAG_IV_STRIPPED) && rx->key &&
123 rx->key->conf.cipher == WL 123 rx->key->conf.cipher == WLAN_CIPHER_SUITE_TKIP)
124 goto update_iv; 124 goto update_iv;
125 125
126 return RX_CONTINUE; 126 return RX_CONTINUE;
127 } 127 }
128 128
129 /* 129 /*
130 * Some hardware seems to generate Mic 130 * Some hardware seems to generate Michael MIC failure reports; even
131 * though, the frame was not encrypted 131 * though, the frame was not encrypted with TKIP and therefore has no
132 * MIC. Ignore the flag them to avoid 132 * MIC. Ignore the flag them to avoid triggering countermeasures.
133 */ 133 */
134 if (!rx->key || rx->key->conf.cipher ! 134 if (!rx->key || rx->key->conf.cipher != WLAN_CIPHER_SUITE_TKIP ||
135 !(status->flag & RX_FLAG_DECRYPTED 135 !(status->flag & RX_FLAG_DECRYPTED))
136 return RX_CONTINUE; 136 return RX_CONTINUE;
137 137
138 if (rx->sdata->vif.type == NL80211_IFT 138 if (rx->sdata->vif.type == NL80211_IFTYPE_AP && rx->key->conf.keyidx) {
139 /* 139 /*
140 * APs with pairwise keys shou 140 * APs with pairwise keys should never receive Michael MIC
141 * errors for non-zero keyidx 141 * errors for non-zero keyidx because these are reserved for
142 * group keys and only the AP 142 * group keys and only the AP is sending real multicast
143 * frames in the BSS. 143 * frames in the BSS.
144 */ 144 */
145 return RX_DROP_U_AP_RX_GROUPCA 145 return RX_DROP_U_AP_RX_GROUPCAST;
146 } 146 }
147 147
148 if (status->flag & RX_FLAG_MMIC_ERROR) 148 if (status->flag & RX_FLAG_MMIC_ERROR)
149 goto mic_fail; 149 goto mic_fail;
150 150
151 hdrlen = ieee80211_hdrlen(hdr->frame_c 151 hdrlen = ieee80211_hdrlen(hdr->frame_control);
152 if (skb->len < hdrlen + MICHAEL_MIC_LE 152 if (skb->len < hdrlen + MICHAEL_MIC_LEN)
153 return RX_DROP_U_SHORT_MMIC; 153 return RX_DROP_U_SHORT_MMIC;
154 154
155 if (skb_linearize(rx->skb)) 155 if (skb_linearize(rx->skb))
156 return RX_DROP_U_OOM; 156 return RX_DROP_U_OOM;
157 hdr = (void *)skb->data; 157 hdr = (void *)skb->data;
158 158
159 data = skb->data + hdrlen; 159 data = skb->data + hdrlen;
160 data_len = skb->len - hdrlen - MICHAEL 160 data_len = skb->len - hdrlen - MICHAEL_MIC_LEN;
161 key = &rx->key->conf.key[NL80211_TKIP_ 161 key = &rx->key->conf.key[NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY];
162 michael_mic(key, hdr, data, data_len, 162 michael_mic(key, hdr, data, data_len, mic);
163 if (crypto_memneq(mic, data + data_len 163 if (crypto_memneq(mic, data + data_len, MICHAEL_MIC_LEN))
164 goto mic_fail; 164 goto mic_fail;
165 165
166 /* remove Michael MIC from payload */ 166 /* remove Michael MIC from payload */
167 skb_trim(skb, skb->len - MICHAEL_MIC_L 167 skb_trim(skb, skb->len - MICHAEL_MIC_LEN);
168 168
169 update_iv: 169 update_iv:
170 /* update IV in key information to be 170 /* update IV in key information to be able to detect replays */
171 rx->key->u.tkip.rx[rx->security_idx].i 171 rx->key->u.tkip.rx[rx->security_idx].iv32 = rx->tkip.iv32;
172 rx->key->u.tkip.rx[rx->security_idx].i 172 rx->key->u.tkip.rx[rx->security_idx].iv16 = rx->tkip.iv16;
173 173
174 return RX_CONTINUE; 174 return RX_CONTINUE;
175 175
176 mic_fail: 176 mic_fail:
177 rx->key->u.tkip.mic_failures++; 177 rx->key->u.tkip.mic_failures++;
178 178
179 mic_fail_no_key: 179 mic_fail_no_key:
180 /* 180 /*
181 * In some cases the key can be unset 181 * In some cases the key can be unset - e.g. a multicast packet, in
182 * a driver that supports HW encryptio 182 * a driver that supports HW encryption. Send up the key idx only if
183 * the key is set. 183 * the key is set.
184 */ 184 */
185 cfg80211_michael_mic_failure(rx->sdata 185 cfg80211_michael_mic_failure(rx->sdata->dev, hdr->addr2,
186 is_multic 186 is_multicast_ether_addr(hdr->addr1) ?
187 NL80211_K 187 NL80211_KEYTYPE_GROUP :
188 NL80211_K 188 NL80211_KEYTYPE_PAIRWISE,
189 rx->key ? 189 rx->key ? rx->key->conf.keyidx : -1,
190 NULL, GFP 190 NULL, GFP_ATOMIC);
191 return RX_DROP_U_MMIC_FAIL; 191 return RX_DROP_U_MMIC_FAIL;
192 } 192 }
193 193
194 static int tkip_encrypt_skb(struct ieee80211_t 194 static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
195 { 195 {
196 struct ieee80211_hdr *hdr = (struct ie 196 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
197 struct ieee80211_key *key = tx->key; 197 struct ieee80211_key *key = tx->key;
198 struct ieee80211_tx_info *info = IEEE8 198 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
199 unsigned int hdrlen; 199 unsigned int hdrlen;
200 int len, tail; 200 int len, tail;
201 u64 pn; 201 u64 pn;
202 u8 *pos; 202 u8 *pos;
203 203
204 if (info->control.hw_key && 204 if (info->control.hw_key &&
205 !(info->control.hw_key->flags & IE 205 !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
206 !(info->control.hw_key->flags & IE 206 !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) {
207 /* hwaccel - with no need for 207 /* hwaccel - with no need for software-generated IV */
208 return 0; 208 return 0;
209 } 209 }
210 210
211 hdrlen = ieee80211_hdrlen(hdr->frame_c 211 hdrlen = ieee80211_hdrlen(hdr->frame_control);
212 len = skb->len - hdrlen; 212 len = skb->len - hdrlen;
213 213
214 if (info->control.hw_key) 214 if (info->control.hw_key)
215 tail = 0; 215 tail = 0;
216 else 216 else
217 tail = IEEE80211_TKIP_ICV_LEN; 217 tail = IEEE80211_TKIP_ICV_LEN;
218 218
219 if (WARN_ON(skb_tailroom(skb) < tail | 219 if (WARN_ON(skb_tailroom(skb) < tail ||
220 skb_headroom(skb) < IEEE80 220 skb_headroom(skb) < IEEE80211_TKIP_IV_LEN))
221 return -1; 221 return -1;
222 222
223 pos = skb_push(skb, IEEE80211_TKIP_IV_ 223 pos = skb_push(skb, IEEE80211_TKIP_IV_LEN);
224 memmove(pos, pos + IEEE80211_TKIP_IV_L 224 memmove(pos, pos + IEEE80211_TKIP_IV_LEN, hdrlen);
225 pos += hdrlen; 225 pos += hdrlen;
226 226
227 /* the HW only needs room for the IV, 227 /* the HW only needs room for the IV, but not the actual IV */
228 if (info->control.hw_key && 228 if (info->control.hw_key &&
229 (info->control.hw_key->flags & IEE 229 (info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE))
230 return 0; 230 return 0;
231 231
232 /* Increase IV for the frame */ 232 /* Increase IV for the frame */
233 pn = atomic64_inc_return(&key->conf.tx 233 pn = atomic64_inc_return(&key->conf.tx_pn);
234 pos = ieee80211_tkip_add_iv(pos, &key- 234 pos = ieee80211_tkip_add_iv(pos, &key->conf, pn);
235 235
236 /* hwaccel - with software IV */ 236 /* hwaccel - with software IV */
237 if (info->control.hw_key) 237 if (info->control.hw_key)
238 return 0; 238 return 0;
239 239
240 /* Add room for ICV */ 240 /* Add room for ICV */
241 skb_put(skb, IEEE80211_TKIP_ICV_LEN); 241 skb_put(skb, IEEE80211_TKIP_ICV_LEN);
242 242
243 return ieee80211_tkip_encrypt_data(&tx 243 return ieee80211_tkip_encrypt_data(&tx->local->wep_tx_ctx,
244 key 244 key, skb, pos, len);
245 } 245 }
246 246
247 247
248 ieee80211_tx_result 248 ieee80211_tx_result
249 ieee80211_crypto_tkip_encrypt(struct ieee80211 249 ieee80211_crypto_tkip_encrypt(struct ieee80211_tx_data *tx)
250 { 250 {
251 struct sk_buff *skb; 251 struct sk_buff *skb;
252 252
253 ieee80211_tx_set_protected(tx); 253 ieee80211_tx_set_protected(tx);
254 254
255 skb_queue_walk(&tx->skbs, skb) { 255 skb_queue_walk(&tx->skbs, skb) {
256 if (tkip_encrypt_skb(tx, skb) 256 if (tkip_encrypt_skb(tx, skb) < 0)
257 return TX_DROP; 257 return TX_DROP;
258 } 258 }
259 259
260 return TX_CONTINUE; 260 return TX_CONTINUE;
261 } 261 }
262 262
263 263
264 ieee80211_rx_result 264 ieee80211_rx_result
265 ieee80211_crypto_tkip_decrypt(struct ieee80211 265 ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx)
266 { 266 {
267 struct ieee80211_hdr *hdr = (struct ie 267 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
268 int hdrlen, res, hwaccel = 0; 268 int hdrlen, res, hwaccel = 0;
269 struct ieee80211_key *key = rx->key; 269 struct ieee80211_key *key = rx->key;
270 struct sk_buff *skb = rx->skb; 270 struct sk_buff *skb = rx->skb;
271 struct ieee80211_rx_status *status = I 271 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
272 272
273 hdrlen = ieee80211_hdrlen(hdr->frame_c 273 hdrlen = ieee80211_hdrlen(hdr->frame_control);
274 274
275 if (!ieee80211_is_data(hdr->frame_cont 275 if (!ieee80211_is_data(hdr->frame_control))
276 return RX_CONTINUE; 276 return RX_CONTINUE;
277 277
278 if (!rx->sta || skb->len - hdrlen < 12 278 if (!rx->sta || skb->len - hdrlen < 12)
279 return RX_DROP_U_SHORT_TKIP; 279 return RX_DROP_U_SHORT_TKIP;
280 280
281 /* it may be possible to optimize this 281 /* it may be possible to optimize this a bit more */
282 if (skb_linearize(rx->skb)) 282 if (skb_linearize(rx->skb))
283 return RX_DROP_U_OOM; 283 return RX_DROP_U_OOM;
284 hdr = (void *)skb->data; 284 hdr = (void *)skb->data;
285 285
286 /* 286 /*
287 * Let TKIP code verify IV, but skip d 287 * Let TKIP code verify IV, but skip decryption.
288 * In the case where hardware checks t 288 * In the case where hardware checks the IV as well,
289 * we don't even get here, see ieee802 289 * we don't even get here, see ieee80211_rx_h_decrypt()
290 */ 290 */
291 if (status->flag & RX_FLAG_DECRYPTED) 291 if (status->flag & RX_FLAG_DECRYPTED)
292 hwaccel = 1; 292 hwaccel = 1;
293 293
294 res = ieee80211_tkip_decrypt_data(&rx- 294 res = ieee80211_tkip_decrypt_data(&rx->local->wep_rx_ctx,
295 key, 295 key, skb->data + hdrlen,
296 skb- 296 skb->len - hdrlen, rx->sta->sta.addr,
297 hdr- 297 hdr->addr1, hwaccel, rx->security_idx,
298 &rx- 298 &rx->tkip.iv32,
299 &rx- 299 &rx->tkip.iv16);
300 if (res != TKIP_DECRYPT_OK) 300 if (res != TKIP_DECRYPT_OK)
301 return RX_DROP_U_TKIP_FAIL; 301 return RX_DROP_U_TKIP_FAIL;
302 302
303 /* Trim ICV */ 303 /* Trim ICV */
304 if (!(status->flag & RX_FLAG_ICV_STRIP 304 if (!(status->flag & RX_FLAG_ICV_STRIPPED))
305 skb_trim(skb, skb->len - IEEE8 305 skb_trim(skb, skb->len - IEEE80211_TKIP_ICV_LEN);
306 306
307 /* Remove IV */ 307 /* Remove IV */
308 memmove(skb->data + IEEE80211_TKIP_IV_ 308 memmove(skb->data + IEEE80211_TKIP_IV_LEN, skb->data, hdrlen);
309 skb_pull(skb, IEEE80211_TKIP_IV_LEN); 309 skb_pull(skb, IEEE80211_TKIP_IV_LEN);
310 310
311 return RX_CONTINUE; 311 return RX_CONTINUE;
312 } 312 }
313 313
314 /* 314 /*
315 * Calculate AAD for CCMP/GCMP, returning qos_ 315 * Calculate AAD for CCMP/GCMP, returning qos_tid since we
316 * need that in CCMP also for b_0. 316 * need that in CCMP also for b_0.
317 */ 317 */
318 static u8 ccmp_gcmp_aad(struct sk_buff *skb, u !! 318 static u8 ccmp_gcmp_aad(struct sk_buff *skb, u8 *aad)
319 { 319 {
320 struct ieee80211_hdr *hdr = (void *)sk 320 struct ieee80211_hdr *hdr = (void *)skb->data;
321 __le16 mask_fc; 321 __le16 mask_fc;
322 int a4_included, mgmt; 322 int a4_included, mgmt;
323 u8 qos_tid; 323 u8 qos_tid;
324 u16 len_a = 22; 324 u16 len_a = 22;
325 325
326 /* 326 /*
327 * Mask FC: zero subtype b4 b5 b6 (if 327 * Mask FC: zero subtype b4 b5 b6 (if not mgmt)
328 * Retry, PwrMgt, MoreData, Order (if 328 * Retry, PwrMgt, MoreData, Order (if Qos Data); set Protected
329 */ 329 */
330 mgmt = ieee80211_is_mgmt(hdr->frame_co 330 mgmt = ieee80211_is_mgmt(hdr->frame_control);
331 mask_fc = hdr->frame_control; 331 mask_fc = hdr->frame_control;
332 mask_fc &= ~cpu_to_le16(IEEE80211_FCTL 332 mask_fc &= ~cpu_to_le16(IEEE80211_FCTL_RETRY |
333 IEEE80211_FCTL 333 IEEE80211_FCTL_PM | IEEE80211_FCTL_MOREDATA);
334 if (!mgmt) 334 if (!mgmt)
335 mask_fc &= ~cpu_to_le16(0x0070 335 mask_fc &= ~cpu_to_le16(0x0070);
336 mask_fc |= cpu_to_le16(IEEE80211_FCTL_ 336 mask_fc |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
337 337
338 a4_included = ieee80211_has_a4(hdr->fr 338 a4_included = ieee80211_has_a4(hdr->frame_control);
339 if (a4_included) 339 if (a4_included)
340 len_a += 6; 340 len_a += 6;
341 341
342 if (ieee80211_is_data_qos(hdr->frame_c 342 if (ieee80211_is_data_qos(hdr->frame_control)) {
343 qos_tid = *ieee80211_get_qos_c !! 343 qos_tid = ieee80211_get_tid(hdr);
344 <<
345 if (spp_amsdu) <<
346 qos_tid &= IEEE80211_Q <<
347 IEEE80211_Q <<
348 else <<
349 qos_tid &= IEEE80211_Q <<
350 <<
351 mask_fc &= ~cpu_to_le16(IEEE80 344 mask_fc &= ~cpu_to_le16(IEEE80211_FCTL_ORDER);
352 len_a += 2; 345 len_a += 2;
353 } else { 346 } else {
354 qos_tid = 0; 347 qos_tid = 0;
355 } 348 }
356 349
357 /* AAD (extra authenticate-only data) 350 /* AAD (extra authenticate-only data) / masked 802.11 header
358 * FC | A1 | A2 | A3 | SC | [A4] | [QC 351 * FC | A1 | A2 | A3 | SC | [A4] | [QC] */
359 put_unaligned_be16(len_a, &aad[0]); 352 put_unaligned_be16(len_a, &aad[0]);
360 put_unaligned(mask_fc, (__le16 *)&aad[ 353 put_unaligned(mask_fc, (__le16 *)&aad[2]);
361 memcpy(&aad[4], &hdr->addrs, 3 * ETH_A 354 memcpy(&aad[4], &hdr->addrs, 3 * ETH_ALEN);
362 355
363 /* Mask Seq#, leave Frag# */ 356 /* Mask Seq#, leave Frag# */
364 aad[22] = *((u8 *) &hdr->seq_ctrl) & 0 357 aad[22] = *((u8 *) &hdr->seq_ctrl) & 0x0f;
365 aad[23] = 0; 358 aad[23] = 0;
366 359
367 if (a4_included) { 360 if (a4_included) {
368 memcpy(&aad[24], hdr->addr4, E 361 memcpy(&aad[24], hdr->addr4, ETH_ALEN);
369 aad[30] = qos_tid; 362 aad[30] = qos_tid;
370 aad[31] = 0; 363 aad[31] = 0;
371 } else { 364 } else {
372 memset(&aad[24], 0, ETH_ALEN + 365 memset(&aad[24], 0, ETH_ALEN + IEEE80211_QOS_CTL_LEN);
373 aad[24] = qos_tid; 366 aad[24] = qos_tid;
374 } 367 }
375 368
376 return qos_tid; 369 return qos_tid;
377 } 370 }
378 371
379 static void ccmp_special_blocks(struct sk_buff !! 372 static void ccmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *b_0, u8 *aad)
380 bool spp_amsdu <<
381 { 373 {
382 struct ieee80211_hdr *hdr = (struct ie 374 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
383 u8 qos_tid = ccmp_gcmp_aad(skb, aad, s !! 375 u8 qos_tid = ccmp_gcmp_aad(skb, aad);
384 376
385 /* In CCM, the initial vectors (IV) us 377 /* In CCM, the initial vectors (IV) used for CTR mode encryption and CBC
386 * mode authentication are not allowed 378 * mode authentication are not allowed to collide, yet both are derived
387 * from this vector b_0. We only set L 379 * from this vector b_0. We only set L := 1 here to indicate that the
388 * data size can be represented in (L+ 380 * data size can be represented in (L+1) bytes. The CCM layer will take
389 * care of storing the data length in 381 * care of storing the data length in the top (L+1) bytes and setting
390 * and clearing the other bits as is r 382 * and clearing the other bits as is required to derive the two IVs.
391 */ 383 */
392 b_0[0] = 0x1; 384 b_0[0] = 0x1;
393 385
394 /* Nonce: Nonce Flags | A2 | PN 386 /* Nonce: Nonce Flags | A2 | PN
395 * Nonce Flags: Priority (b0..b3) | Ma 387 * Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)
396 */ 388 */
397 b_0[1] = qos_tid | (ieee80211_is_mgmt( 389 b_0[1] = qos_tid | (ieee80211_is_mgmt(hdr->frame_control) << 4);
398 memcpy(&b_0[2], hdr->addr2, ETH_ALEN); 390 memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
399 memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_ 391 memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);
400 } 392 }
401 393
402 static inline void ccmp_pn2hdr(u8 *hdr, u8 *pn 394 static inline void ccmp_pn2hdr(u8 *hdr, u8 *pn, int key_id)
403 { 395 {
404 hdr[0] = pn[5]; 396 hdr[0] = pn[5];
405 hdr[1] = pn[4]; 397 hdr[1] = pn[4];
406 hdr[2] = 0; 398 hdr[2] = 0;
407 hdr[3] = 0x20 | (key_id << 6); 399 hdr[3] = 0x20 | (key_id << 6);
408 hdr[4] = pn[3]; 400 hdr[4] = pn[3];
409 hdr[5] = pn[2]; 401 hdr[5] = pn[2];
410 hdr[6] = pn[1]; 402 hdr[6] = pn[1];
411 hdr[7] = pn[0]; 403 hdr[7] = pn[0];
412 } 404 }
413 405
414 406
415 static inline void ccmp_hdr2pn(u8 *pn, u8 *hdr 407 static inline void ccmp_hdr2pn(u8 *pn, u8 *hdr)
416 { 408 {
417 pn[0] = hdr[7]; 409 pn[0] = hdr[7];
418 pn[1] = hdr[6]; 410 pn[1] = hdr[6];
419 pn[2] = hdr[5]; 411 pn[2] = hdr[5];
420 pn[3] = hdr[4]; 412 pn[3] = hdr[4];
421 pn[4] = hdr[1]; 413 pn[4] = hdr[1];
422 pn[5] = hdr[0]; 414 pn[5] = hdr[0];
423 } 415 }
424 416
425 417
426 static int ccmp_encrypt_skb(struct ieee80211_t 418 static int ccmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb,
427 unsigned int mic_l 419 unsigned int mic_len)
428 { 420 {
429 struct ieee80211_hdr *hdr = (struct ie 421 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
430 struct ieee80211_key *key = tx->key; 422 struct ieee80211_key *key = tx->key;
431 struct ieee80211_tx_info *info = IEEE8 423 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
432 int hdrlen, len, tail; 424 int hdrlen, len, tail;
433 u8 *pos; 425 u8 *pos;
434 u8 pn[6]; 426 u8 pn[6];
435 u64 pn64; 427 u64 pn64;
436 u8 aad[CCM_AAD_LEN]; 428 u8 aad[CCM_AAD_LEN];
437 u8 b_0[AES_BLOCK_SIZE]; 429 u8 b_0[AES_BLOCK_SIZE];
438 430
439 if (info->control.hw_key && 431 if (info->control.hw_key &&
440 !(info->control.hw_key->flags & IE 432 !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
441 !(info->control.hw_key->flags & IE 433 !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE) &&
442 !((info->control.hw_key->flags & 434 !((info->control.hw_key->flags &
443 IEEE80211_KEY_FLAG_GENERATE_IV_ 435 IEEE80211_KEY_FLAG_GENERATE_IV_MGMT) &&
444 ieee80211_is_mgmt(hdr->frame_con 436 ieee80211_is_mgmt(hdr->frame_control))) {
445 /* 437 /*
446 * hwaccel has no need for pre 438 * hwaccel has no need for preallocated room for CCMP
447 * header or MIC fields 439 * header or MIC fields
448 */ 440 */
449 return 0; 441 return 0;
450 } 442 }
451 443
452 hdrlen = ieee80211_hdrlen(hdr->frame_c 444 hdrlen = ieee80211_hdrlen(hdr->frame_control);
453 len = skb->len - hdrlen; 445 len = skb->len - hdrlen;
454 446
455 if (info->control.hw_key) 447 if (info->control.hw_key)
456 tail = 0; 448 tail = 0;
457 else 449 else
458 tail = mic_len; 450 tail = mic_len;
459 451
460 if (WARN_ON(skb_tailroom(skb) < tail | 452 if (WARN_ON(skb_tailroom(skb) < tail ||
461 skb_headroom(skb) < IEEE80 453 skb_headroom(skb) < IEEE80211_CCMP_HDR_LEN))
462 return -1; 454 return -1;
463 455
464 pos = skb_push(skb, IEEE80211_CCMP_HDR 456 pos = skb_push(skb, IEEE80211_CCMP_HDR_LEN);
465 memmove(pos, pos + IEEE80211_CCMP_HDR_ 457 memmove(pos, pos + IEEE80211_CCMP_HDR_LEN, hdrlen);
466 458
467 /* the HW only needs room for the IV, 459 /* the HW only needs room for the IV, but not the actual IV */
468 if (info->control.hw_key && 460 if (info->control.hw_key &&
469 (info->control.hw_key->flags & IEE 461 (info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE))
470 return 0; 462 return 0;
471 463
472 pos += hdrlen; 464 pos += hdrlen;
473 465
474 pn64 = atomic64_inc_return(&key->conf. 466 pn64 = atomic64_inc_return(&key->conf.tx_pn);
475 467
476 pn[5] = pn64; 468 pn[5] = pn64;
477 pn[4] = pn64 >> 8; 469 pn[4] = pn64 >> 8;
478 pn[3] = pn64 >> 16; 470 pn[3] = pn64 >> 16;
479 pn[2] = pn64 >> 24; 471 pn[2] = pn64 >> 24;
480 pn[1] = pn64 >> 32; 472 pn[1] = pn64 >> 32;
481 pn[0] = pn64 >> 40; 473 pn[0] = pn64 >> 40;
482 474
483 ccmp_pn2hdr(pos, pn, key->conf.keyidx) 475 ccmp_pn2hdr(pos, pn, key->conf.keyidx);
484 476
485 /* hwaccel - with software CCMP header 477 /* hwaccel - with software CCMP header */
486 if (info->control.hw_key) 478 if (info->control.hw_key)
487 return 0; 479 return 0;
488 480
489 pos += IEEE80211_CCMP_HDR_LEN; 481 pos += IEEE80211_CCMP_HDR_LEN;
490 ccmp_special_blocks(skb, pn, b_0, aad, !! 482 ccmp_special_blocks(skb, pn, b_0, aad);
491 key->conf.flags & <<
492 return ieee80211_aes_ccm_encrypt(key-> 483 return ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
493 skb_p 484 skb_put(skb, mic_len));
494 } 485 }
495 486
496 487
497 ieee80211_tx_result 488 ieee80211_tx_result
498 ieee80211_crypto_ccmp_encrypt(struct ieee80211 489 ieee80211_crypto_ccmp_encrypt(struct ieee80211_tx_data *tx,
499 unsigned int mic 490 unsigned int mic_len)
500 { 491 {
501 struct sk_buff *skb; 492 struct sk_buff *skb;
502 493
503 ieee80211_tx_set_protected(tx); 494 ieee80211_tx_set_protected(tx);
504 495
505 skb_queue_walk(&tx->skbs, skb) { 496 skb_queue_walk(&tx->skbs, skb) {
506 if (ccmp_encrypt_skb(tx, skb, 497 if (ccmp_encrypt_skb(tx, skb, mic_len) < 0)
507 return TX_DROP; 498 return TX_DROP;
508 } 499 }
509 500
510 return TX_CONTINUE; 501 return TX_CONTINUE;
511 } 502 }
512 503
513 504
514 ieee80211_rx_result 505 ieee80211_rx_result
515 ieee80211_crypto_ccmp_decrypt(struct ieee80211 506 ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx,
516 unsigned int mic 507 unsigned int mic_len)
517 { 508 {
518 struct ieee80211_hdr *hdr = (struct ie 509 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
519 int hdrlen; 510 int hdrlen;
520 struct ieee80211_key *key = rx->key; 511 struct ieee80211_key *key = rx->key;
521 struct sk_buff *skb = rx->skb; 512 struct sk_buff *skb = rx->skb;
522 struct ieee80211_rx_status *status = I 513 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
523 u8 pn[IEEE80211_CCMP_PN_LEN]; 514 u8 pn[IEEE80211_CCMP_PN_LEN];
524 int data_len; 515 int data_len;
525 int queue; 516 int queue;
526 517
527 hdrlen = ieee80211_hdrlen(hdr->frame_c 518 hdrlen = ieee80211_hdrlen(hdr->frame_control);
528 519
529 if (!ieee80211_is_data(hdr->frame_cont 520 if (!ieee80211_is_data(hdr->frame_control) &&
530 !ieee80211_is_robust_mgmt_frame(sk 521 !ieee80211_is_robust_mgmt_frame(skb))
531 return RX_CONTINUE; 522 return RX_CONTINUE;
532 523
533 if (status->flag & RX_FLAG_DECRYPTED) 524 if (status->flag & RX_FLAG_DECRYPTED) {
534 if (!pskb_may_pull(rx->skb, hd 525 if (!pskb_may_pull(rx->skb, hdrlen + IEEE80211_CCMP_HDR_LEN))
535 return RX_DROP_U_SHORT 526 return RX_DROP_U_SHORT_CCMP;
536 if (status->flag & RX_FLAG_MIC 527 if (status->flag & RX_FLAG_MIC_STRIPPED)
537 mic_len = 0; 528 mic_len = 0;
538 } else { 529 } else {
539 if (skb_linearize(rx->skb)) 530 if (skb_linearize(rx->skb))
540 return RX_DROP_U_OOM; 531 return RX_DROP_U_OOM;
541 } 532 }
542 533
543 /* reload hdr - skb might have been re 534 /* reload hdr - skb might have been reallocated */
544 hdr = (void *)rx->skb->data; 535 hdr = (void *)rx->skb->data;
545 536
546 data_len = skb->len - hdrlen - IEEE802 537 data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN - mic_len;
547 if (!rx->sta || data_len < 0) 538 if (!rx->sta || data_len < 0)
548 return RX_DROP_U_SHORT_CCMP; 539 return RX_DROP_U_SHORT_CCMP;
549 540
550 if (!(status->flag & RX_FLAG_PN_VALIDA 541 if (!(status->flag & RX_FLAG_PN_VALIDATED)) {
551 int res; 542 int res;
552 543
553 ccmp_hdr2pn(pn, skb->data + hd 544 ccmp_hdr2pn(pn, skb->data + hdrlen);
554 545
555 queue = rx->security_idx; 546 queue = rx->security_idx;
556 547
557 res = memcmp(pn, key->u.ccmp.r 548 res = memcmp(pn, key->u.ccmp.rx_pn[queue],
558 IEEE80211_CCMP_PN 549 IEEE80211_CCMP_PN_LEN);
559 if (res < 0 || 550 if (res < 0 ||
560 (!res && !(status->flag & 551 (!res && !(status->flag & RX_FLAG_ALLOW_SAME_PN))) {
561 key->u.ccmp.replays++; 552 key->u.ccmp.replays++;
562 return RX_DROP_U_REPLA 553 return RX_DROP_U_REPLAY;
563 } 554 }
564 555
565 if (!(status->flag & RX_FLAG_D 556 if (!(status->flag & RX_FLAG_DECRYPTED)) {
566 u8 aad[2 * AES_BLOCK_S 557 u8 aad[2 * AES_BLOCK_SIZE];
567 u8 b_0[AES_BLOCK_SIZE] 558 u8 b_0[AES_BLOCK_SIZE];
568 /* hardware didn't dec 559 /* hardware didn't decrypt/verify MIC */
569 ccmp_special_blocks(sk !! 560 ccmp_special_blocks(skb, pn, b_0, aad);
570 ke <<
571 561
572 if (ieee80211_aes_ccm_ 562 if (ieee80211_aes_ccm_decrypt(
573 key->u.ccm 563 key->u.ccmp.tfm, b_0, aad,
574 skb->data 564 skb->data + hdrlen + IEEE80211_CCMP_HDR_LEN,
575 data_len, 565 data_len,
576 skb->data 566 skb->data + skb->len - mic_len))
577 return RX_DROP 567 return RX_DROP_U_MIC_FAIL;
578 } 568 }
579 569
580 memcpy(key->u.ccmp.rx_pn[queue 570 memcpy(key->u.ccmp.rx_pn[queue], pn, IEEE80211_CCMP_PN_LEN);
581 if (unlikely(ieee80211_is_frag 571 if (unlikely(ieee80211_is_frag(hdr)))
582 memcpy(rx->ccm_gcm.pn, 572 memcpy(rx->ccm_gcm.pn, pn, IEEE80211_CCMP_PN_LEN);
583 } 573 }
584 574
585 /* Remove CCMP header and MIC */ 575 /* Remove CCMP header and MIC */
586 if (pskb_trim(skb, skb->len - mic_len) 576 if (pskb_trim(skb, skb->len - mic_len))
587 return RX_DROP_U_SHORT_CCMP_MI 577 return RX_DROP_U_SHORT_CCMP_MIC;
588 memmove(skb->data + IEEE80211_CCMP_HDR 578 memmove(skb->data + IEEE80211_CCMP_HDR_LEN, skb->data, hdrlen);
589 skb_pull(skb, IEEE80211_CCMP_HDR_LEN); 579 skb_pull(skb, IEEE80211_CCMP_HDR_LEN);
590 580
591 return RX_CONTINUE; 581 return RX_CONTINUE;
592 } 582 }
593 583
594 static void gcmp_special_blocks(struct sk_buff !! 584 static void gcmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *j_0, u8 *aad)
595 bool spp_amsdu <<
596 { 585 {
597 struct ieee80211_hdr *hdr = (void *)sk 586 struct ieee80211_hdr *hdr = (void *)skb->data;
598 587
599 memcpy(j_0, hdr->addr2, ETH_ALEN); 588 memcpy(j_0, hdr->addr2, ETH_ALEN);
600 memcpy(&j_0[ETH_ALEN], pn, IEEE80211_G 589 memcpy(&j_0[ETH_ALEN], pn, IEEE80211_GCMP_PN_LEN);
601 j_0[13] = 0; 590 j_0[13] = 0;
602 j_0[14] = 0; 591 j_0[14] = 0;
603 j_0[AES_BLOCK_SIZE - 1] = 0x01; 592 j_0[AES_BLOCK_SIZE - 1] = 0x01;
604 593
605 ccmp_gcmp_aad(skb, aad, spp_amsdu); !! 594 ccmp_gcmp_aad(skb, aad);
606 } 595 }
607 596
608 static inline void gcmp_pn2hdr(u8 *hdr, const 597 static inline void gcmp_pn2hdr(u8 *hdr, const u8 *pn, int key_id)
609 { 598 {
610 hdr[0] = pn[5]; 599 hdr[0] = pn[5];
611 hdr[1] = pn[4]; 600 hdr[1] = pn[4];
612 hdr[2] = 0; 601 hdr[2] = 0;
613 hdr[3] = 0x20 | (key_id << 6); 602 hdr[3] = 0x20 | (key_id << 6);
614 hdr[4] = pn[3]; 603 hdr[4] = pn[3];
615 hdr[5] = pn[2]; 604 hdr[5] = pn[2];
616 hdr[6] = pn[1]; 605 hdr[6] = pn[1];
617 hdr[7] = pn[0]; 606 hdr[7] = pn[0];
618 } 607 }
619 608
620 static inline void gcmp_hdr2pn(u8 *pn, const u 609 static inline void gcmp_hdr2pn(u8 *pn, const u8 *hdr)
621 { 610 {
622 pn[0] = hdr[7]; 611 pn[0] = hdr[7];
623 pn[1] = hdr[6]; 612 pn[1] = hdr[6];
624 pn[2] = hdr[5]; 613 pn[2] = hdr[5];
625 pn[3] = hdr[4]; 614 pn[3] = hdr[4];
626 pn[4] = hdr[1]; 615 pn[4] = hdr[1];
627 pn[5] = hdr[0]; 616 pn[5] = hdr[0];
628 } 617 }
629 618
630 static int gcmp_encrypt_skb(struct ieee80211_t 619 static int gcmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
631 { 620 {
632 struct ieee80211_hdr *hdr = (struct ie 621 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
633 struct ieee80211_key *key = tx->key; 622 struct ieee80211_key *key = tx->key;
634 struct ieee80211_tx_info *info = IEEE8 623 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
635 int hdrlen, len, tail; 624 int hdrlen, len, tail;
636 u8 *pos; 625 u8 *pos;
637 u8 pn[6]; 626 u8 pn[6];
638 u64 pn64; 627 u64 pn64;
639 u8 aad[GCM_AAD_LEN]; 628 u8 aad[GCM_AAD_LEN];
640 u8 j_0[AES_BLOCK_SIZE]; 629 u8 j_0[AES_BLOCK_SIZE];
641 630
642 if (info->control.hw_key && 631 if (info->control.hw_key &&
643 !(info->control.hw_key->flags & IE 632 !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
644 !(info->control.hw_key->flags & IE 633 !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE) &&
645 !((info->control.hw_key->flags & 634 !((info->control.hw_key->flags &
646 IEEE80211_KEY_FLAG_GENERATE_IV_ 635 IEEE80211_KEY_FLAG_GENERATE_IV_MGMT) &&
647 ieee80211_is_mgmt(hdr->frame_con 636 ieee80211_is_mgmt(hdr->frame_control))) {
648 /* hwaccel has no need for pre 637 /* hwaccel has no need for preallocated room for GCMP
649 * header or MIC fields 638 * header or MIC fields
650 */ 639 */
651 return 0; 640 return 0;
652 } 641 }
653 642
654 hdrlen = ieee80211_hdrlen(hdr->frame_c 643 hdrlen = ieee80211_hdrlen(hdr->frame_control);
655 len = skb->len - hdrlen; 644 len = skb->len - hdrlen;
656 645
657 if (info->control.hw_key) 646 if (info->control.hw_key)
658 tail = 0; 647 tail = 0;
659 else 648 else
660 tail = IEEE80211_GCMP_MIC_LEN; 649 tail = IEEE80211_GCMP_MIC_LEN;
661 650
662 if (WARN_ON(skb_tailroom(skb) < tail | 651 if (WARN_ON(skb_tailroom(skb) < tail ||
663 skb_headroom(skb) < IEEE80 652 skb_headroom(skb) < IEEE80211_GCMP_HDR_LEN))
664 return -1; 653 return -1;
665 654
666 pos = skb_push(skb, IEEE80211_GCMP_HDR 655 pos = skb_push(skb, IEEE80211_GCMP_HDR_LEN);
667 memmove(pos, pos + IEEE80211_GCMP_HDR_ 656 memmove(pos, pos + IEEE80211_GCMP_HDR_LEN, hdrlen);
668 skb_set_network_header(skb, skb_networ 657 skb_set_network_header(skb, skb_network_offset(skb) +
669 IEEE80211_ 658 IEEE80211_GCMP_HDR_LEN);
670 659
671 /* the HW only needs room for the IV, 660 /* the HW only needs room for the IV, but not the actual IV */
672 if (info->control.hw_key && 661 if (info->control.hw_key &&
673 (info->control.hw_key->flags & IEE 662 (info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE))
674 return 0; 663 return 0;
675 664
676 pos += hdrlen; 665 pos += hdrlen;
677 666
678 pn64 = atomic64_inc_return(&key->conf. 667 pn64 = atomic64_inc_return(&key->conf.tx_pn);
679 668
680 pn[5] = pn64; 669 pn[5] = pn64;
681 pn[4] = pn64 >> 8; 670 pn[4] = pn64 >> 8;
682 pn[3] = pn64 >> 16; 671 pn[3] = pn64 >> 16;
683 pn[2] = pn64 >> 24; 672 pn[2] = pn64 >> 24;
684 pn[1] = pn64 >> 32; 673 pn[1] = pn64 >> 32;
685 pn[0] = pn64 >> 40; 674 pn[0] = pn64 >> 40;
686 675
687 gcmp_pn2hdr(pos, pn, key->conf.keyidx) 676 gcmp_pn2hdr(pos, pn, key->conf.keyidx);
688 677
689 /* hwaccel - with software GCMP header 678 /* hwaccel - with software GCMP header */
690 if (info->control.hw_key) 679 if (info->control.hw_key)
691 return 0; 680 return 0;
692 681
693 pos += IEEE80211_GCMP_HDR_LEN; 682 pos += IEEE80211_GCMP_HDR_LEN;
694 gcmp_special_blocks(skb, pn, j_0, aad, !! 683 gcmp_special_blocks(skb, pn, j_0, aad);
695 key->conf.flags & <<
696 return ieee80211_aes_gcm_encrypt(key-> 684 return ieee80211_aes_gcm_encrypt(key->u.gcmp.tfm, j_0, aad, pos, len,
697 skb_p 685 skb_put(skb, IEEE80211_GCMP_MIC_LEN));
698 } 686 }
699 687
700 ieee80211_tx_result 688 ieee80211_tx_result
701 ieee80211_crypto_gcmp_encrypt(struct ieee80211 689 ieee80211_crypto_gcmp_encrypt(struct ieee80211_tx_data *tx)
702 { 690 {
703 struct sk_buff *skb; 691 struct sk_buff *skb;
704 692
705 ieee80211_tx_set_protected(tx); 693 ieee80211_tx_set_protected(tx);
706 694
707 skb_queue_walk(&tx->skbs, skb) { 695 skb_queue_walk(&tx->skbs, skb) {
708 if (gcmp_encrypt_skb(tx, skb) 696 if (gcmp_encrypt_skb(tx, skb) < 0)
709 return TX_DROP; 697 return TX_DROP;
710 } 698 }
711 699
712 return TX_CONTINUE; 700 return TX_CONTINUE;
713 } 701 }
714 702
715 ieee80211_rx_result 703 ieee80211_rx_result
716 ieee80211_crypto_gcmp_decrypt(struct ieee80211 704 ieee80211_crypto_gcmp_decrypt(struct ieee80211_rx_data *rx)
717 { 705 {
718 struct ieee80211_hdr *hdr = (struct ie 706 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
719 int hdrlen; 707 int hdrlen;
720 struct ieee80211_key *key = rx->key; 708 struct ieee80211_key *key = rx->key;
721 struct sk_buff *skb = rx->skb; 709 struct sk_buff *skb = rx->skb;
722 struct ieee80211_rx_status *status = I 710 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
723 u8 pn[IEEE80211_GCMP_PN_LEN]; 711 u8 pn[IEEE80211_GCMP_PN_LEN];
724 int data_len, queue, mic_len = IEEE802 712 int data_len, queue, mic_len = IEEE80211_GCMP_MIC_LEN;
725 713
726 hdrlen = ieee80211_hdrlen(hdr->frame_c 714 hdrlen = ieee80211_hdrlen(hdr->frame_control);
727 715
728 if (!ieee80211_is_data(hdr->frame_cont 716 if (!ieee80211_is_data(hdr->frame_control) &&
729 !ieee80211_is_robust_mgmt_frame(sk 717 !ieee80211_is_robust_mgmt_frame(skb))
730 return RX_CONTINUE; 718 return RX_CONTINUE;
731 719
732 if (status->flag & RX_FLAG_DECRYPTED) 720 if (status->flag & RX_FLAG_DECRYPTED) {
733 if (!pskb_may_pull(rx->skb, hd 721 if (!pskb_may_pull(rx->skb, hdrlen + IEEE80211_GCMP_HDR_LEN))
734 return RX_DROP_U_SHORT 722 return RX_DROP_U_SHORT_GCMP;
735 if (status->flag & RX_FLAG_MIC 723 if (status->flag & RX_FLAG_MIC_STRIPPED)
736 mic_len = 0; 724 mic_len = 0;
737 } else { 725 } else {
738 if (skb_linearize(rx->skb)) 726 if (skb_linearize(rx->skb))
739 return RX_DROP_U_OOM; 727 return RX_DROP_U_OOM;
740 } 728 }
741 729
742 /* reload hdr - skb might have been re 730 /* reload hdr - skb might have been reallocated */
743 hdr = (void *)rx->skb->data; 731 hdr = (void *)rx->skb->data;
744 732
745 data_len = skb->len - hdrlen - IEEE802 733 data_len = skb->len - hdrlen - IEEE80211_GCMP_HDR_LEN - mic_len;
746 if (!rx->sta || data_len < 0) 734 if (!rx->sta || data_len < 0)
747 return RX_DROP_U_SHORT_GCMP; 735 return RX_DROP_U_SHORT_GCMP;
748 736
749 if (!(status->flag & RX_FLAG_PN_VALIDA 737 if (!(status->flag & RX_FLAG_PN_VALIDATED)) {
750 int res; 738 int res;
751 739
752 gcmp_hdr2pn(pn, skb->data + hd 740 gcmp_hdr2pn(pn, skb->data + hdrlen);
753 741
754 queue = rx->security_idx; 742 queue = rx->security_idx;
755 743
756 res = memcmp(pn, key->u.gcmp.r 744 res = memcmp(pn, key->u.gcmp.rx_pn[queue],
757 IEEE80211_GCMP_PN 745 IEEE80211_GCMP_PN_LEN);
758 if (res < 0 || 746 if (res < 0 ||
759 (!res && !(status->flag & 747 (!res && !(status->flag & RX_FLAG_ALLOW_SAME_PN))) {
760 key->u.gcmp.replays++; 748 key->u.gcmp.replays++;
761 return RX_DROP_U_REPLA 749 return RX_DROP_U_REPLAY;
762 } 750 }
763 751
764 if (!(status->flag & RX_FLAG_D 752 if (!(status->flag & RX_FLAG_DECRYPTED)) {
765 u8 aad[2 * AES_BLOCK_S 753 u8 aad[2 * AES_BLOCK_SIZE];
766 u8 j_0[AES_BLOCK_SIZE] 754 u8 j_0[AES_BLOCK_SIZE];
767 /* hardware didn't dec 755 /* hardware didn't decrypt/verify MIC */
768 gcmp_special_blocks(sk !! 756 gcmp_special_blocks(skb, pn, j_0, aad);
769 ke <<
770 757
771 if (ieee80211_aes_gcm_ 758 if (ieee80211_aes_gcm_decrypt(
772 key->u.gcm 759 key->u.gcmp.tfm, j_0, aad,
773 skb->data 760 skb->data + hdrlen + IEEE80211_GCMP_HDR_LEN,
774 data_len, 761 data_len,
775 skb->data 762 skb->data + skb->len -
776 IEEE80211_ 763 IEEE80211_GCMP_MIC_LEN))
777 return RX_DROP 764 return RX_DROP_U_MIC_FAIL;
778 } 765 }
779 766
780 memcpy(key->u.gcmp.rx_pn[queue 767 memcpy(key->u.gcmp.rx_pn[queue], pn, IEEE80211_GCMP_PN_LEN);
781 if (unlikely(ieee80211_is_frag 768 if (unlikely(ieee80211_is_frag(hdr)))
782 memcpy(rx->ccm_gcm.pn, 769 memcpy(rx->ccm_gcm.pn, pn, IEEE80211_CCMP_PN_LEN);
783 } 770 }
784 771
785 /* Remove GCMP header and MIC */ 772 /* Remove GCMP header and MIC */
786 if (pskb_trim(skb, skb->len - mic_len) 773 if (pskb_trim(skb, skb->len - mic_len))
787 return RX_DROP_U_SHORT_GCMP_MI 774 return RX_DROP_U_SHORT_GCMP_MIC;
788 memmove(skb->data + IEEE80211_GCMP_HDR 775 memmove(skb->data + IEEE80211_GCMP_HDR_LEN, skb->data, hdrlen);
789 skb_pull(skb, IEEE80211_GCMP_HDR_LEN); 776 skb_pull(skb, IEEE80211_GCMP_HDR_LEN);
790 777
791 return RX_CONTINUE; 778 return RX_CONTINUE;
792 } 779 }
793 780
794 static void bip_aad(struct sk_buff *skb, u8 *a 781 static void bip_aad(struct sk_buff *skb, u8 *aad)
795 { 782 {
796 __le16 mask_fc; 783 __le16 mask_fc;
797 struct ieee80211_hdr *hdr = (struct ie 784 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
798 785
799 /* BIP AAD: FC(masked) || A1 || A2 || 786 /* BIP AAD: FC(masked) || A1 || A2 || A3 */
800 787
801 /* FC type/subtype */ 788 /* FC type/subtype */
802 /* Mask FC Retry, PwrMgt, MoreData fla 789 /* Mask FC Retry, PwrMgt, MoreData flags to zero */
803 mask_fc = hdr->frame_control; 790 mask_fc = hdr->frame_control;
804 mask_fc &= ~cpu_to_le16(IEEE80211_FCTL 791 mask_fc &= ~cpu_to_le16(IEEE80211_FCTL_RETRY | IEEE80211_FCTL_PM |
805 IEEE80211_FCTL 792 IEEE80211_FCTL_MOREDATA);
806 put_unaligned(mask_fc, (__le16 *) &aad 793 put_unaligned(mask_fc, (__le16 *) &aad[0]);
807 /* A1 || A2 || A3 */ 794 /* A1 || A2 || A3 */
808 memcpy(aad + 2, &hdr->addrs, 3 * ETH_A 795 memcpy(aad + 2, &hdr->addrs, 3 * ETH_ALEN);
809 } 796 }
810 797
811 798
812 static inline void bip_ipn_set64(u8 *d, u64 pn 799 static inline void bip_ipn_set64(u8 *d, u64 pn)
813 { 800 {
814 *d++ = pn; 801 *d++ = pn;
815 *d++ = pn >> 8; 802 *d++ = pn >> 8;
816 *d++ = pn >> 16; 803 *d++ = pn >> 16;
817 *d++ = pn >> 24; 804 *d++ = pn >> 24;
818 *d++ = pn >> 32; 805 *d++ = pn >> 32;
819 *d = pn >> 40; 806 *d = pn >> 40;
820 } 807 }
821 808
822 static inline void bip_ipn_swap(u8 *d, const u 809 static inline void bip_ipn_swap(u8 *d, const u8 *s)
823 { 810 {
824 *d++ = s[5]; 811 *d++ = s[5];
825 *d++ = s[4]; 812 *d++ = s[4];
826 *d++ = s[3]; 813 *d++ = s[3];
827 *d++ = s[2]; 814 *d++ = s[2];
828 *d++ = s[1]; 815 *d++ = s[1];
829 *d = s[0]; 816 *d = s[0];
830 } 817 }
831 818
832 819
833 ieee80211_tx_result 820 ieee80211_tx_result
834 ieee80211_crypto_aes_cmac_encrypt(struct ieee8 821 ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx)
835 { 822 {
836 struct sk_buff *skb; 823 struct sk_buff *skb;
837 struct ieee80211_tx_info *info; 824 struct ieee80211_tx_info *info;
838 struct ieee80211_key *key = tx->key; 825 struct ieee80211_key *key = tx->key;
839 struct ieee80211_mmie *mmie; 826 struct ieee80211_mmie *mmie;
840 u8 aad[20]; 827 u8 aad[20];
841 u64 pn64; 828 u64 pn64;
842 829
843 if (WARN_ON(skb_queue_len(&tx->skbs) ! 830 if (WARN_ON(skb_queue_len(&tx->skbs) != 1))
844 return TX_DROP; 831 return TX_DROP;
845 832
846 skb = skb_peek(&tx->skbs); 833 skb = skb_peek(&tx->skbs);
847 834
848 info = IEEE80211_SKB_CB(skb); 835 info = IEEE80211_SKB_CB(skb);
849 836
850 if (info->control.hw_key && 837 if (info->control.hw_key &&
851 !(key->conf.flags & IEEE80211_KEY_ 838 !(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIE))
852 return TX_CONTINUE; 839 return TX_CONTINUE;
853 840
854 if (WARN_ON(skb_tailroom(skb) < sizeof 841 if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie)))
855 return TX_DROP; 842 return TX_DROP;
856 843
857 mmie = skb_put(skb, sizeof(*mmie)); 844 mmie = skb_put(skb, sizeof(*mmie));
858 mmie->element_id = WLAN_EID_MMIE; 845 mmie->element_id = WLAN_EID_MMIE;
859 mmie->length = sizeof(*mmie) - 2; 846 mmie->length = sizeof(*mmie) - 2;
860 mmie->key_id = cpu_to_le16(key->conf.k 847 mmie->key_id = cpu_to_le16(key->conf.keyidx);
861 848
862 /* PN = PN + 1 */ 849 /* PN = PN + 1 */
863 pn64 = atomic64_inc_return(&key->conf. 850 pn64 = atomic64_inc_return(&key->conf.tx_pn);
864 851
865 bip_ipn_set64(mmie->sequence_number, p 852 bip_ipn_set64(mmie->sequence_number, pn64);
866 853
867 if (info->control.hw_key) 854 if (info->control.hw_key)
868 return TX_CONTINUE; 855 return TX_CONTINUE;
869 856
870 bip_aad(skb, aad); 857 bip_aad(skb, aad);
871 858
872 /* 859 /*
873 * MIC = AES-128-CMAC(IGTK, AAD || Man 860 * MIC = AES-128-CMAC(IGTK, AAD || Management Frame Body || MMIE, 64)
874 */ 861 */
875 ieee80211_aes_cmac(key->u.aes_cmac.tfm 862 ieee80211_aes_cmac(key->u.aes_cmac.tfm, aad,
876 skb->data + 24, skb 863 skb->data + 24, skb->len - 24, mmie->mic);
877 864
878 return TX_CONTINUE; 865 return TX_CONTINUE;
879 } 866 }
880 867
881 ieee80211_tx_result 868 ieee80211_tx_result
882 ieee80211_crypto_aes_cmac_256_encrypt(struct i 869 ieee80211_crypto_aes_cmac_256_encrypt(struct ieee80211_tx_data *tx)
883 { 870 {
884 struct sk_buff *skb; 871 struct sk_buff *skb;
885 struct ieee80211_tx_info *info; 872 struct ieee80211_tx_info *info;
886 struct ieee80211_key *key = tx->key; 873 struct ieee80211_key *key = tx->key;
887 struct ieee80211_mmie_16 *mmie; 874 struct ieee80211_mmie_16 *mmie;
888 u8 aad[20]; 875 u8 aad[20];
889 u64 pn64; 876 u64 pn64;
890 877
891 if (WARN_ON(skb_queue_len(&tx->skbs) ! 878 if (WARN_ON(skb_queue_len(&tx->skbs) != 1))
892 return TX_DROP; 879 return TX_DROP;
893 880
894 skb = skb_peek(&tx->skbs); 881 skb = skb_peek(&tx->skbs);
895 882
896 info = IEEE80211_SKB_CB(skb); 883 info = IEEE80211_SKB_CB(skb);
897 884
898 if (info->control.hw_key && !! 885 if (info->control.hw_key)
899 !(key->conf.flags & IEEE80211_KEY_ <<
900 return TX_CONTINUE; 886 return TX_CONTINUE;
901 887
902 if (WARN_ON(skb_tailroom(skb) < sizeof 888 if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie)))
903 return TX_DROP; 889 return TX_DROP;
904 890
905 mmie = skb_put(skb, sizeof(*mmie)); 891 mmie = skb_put(skb, sizeof(*mmie));
906 mmie->element_id = WLAN_EID_MMIE; 892 mmie->element_id = WLAN_EID_MMIE;
907 mmie->length = sizeof(*mmie) - 2; 893 mmie->length = sizeof(*mmie) - 2;
908 mmie->key_id = cpu_to_le16(key->conf.k 894 mmie->key_id = cpu_to_le16(key->conf.keyidx);
909 895
910 /* PN = PN + 1 */ 896 /* PN = PN + 1 */
911 pn64 = atomic64_inc_return(&key->conf. 897 pn64 = atomic64_inc_return(&key->conf.tx_pn);
912 898
913 bip_ipn_set64(mmie->sequence_number, p 899 bip_ipn_set64(mmie->sequence_number, pn64);
914 900
915 if (info->control.hw_key) <<
916 return TX_CONTINUE; <<
917 <<
918 bip_aad(skb, aad); 901 bip_aad(skb, aad);
919 902
920 /* MIC = AES-256-CMAC(IGTK, AAD || Man 903 /* MIC = AES-256-CMAC(IGTK, AAD || Management Frame Body || MMIE, 128)
921 */ 904 */
922 ieee80211_aes_cmac_256(key->u.aes_cmac 905 ieee80211_aes_cmac_256(key->u.aes_cmac.tfm, aad,
923 skb->data + 24, 906 skb->data + 24, skb->len - 24, mmie->mic);
924 907
925 return TX_CONTINUE; 908 return TX_CONTINUE;
926 } 909 }
927 910
928 ieee80211_rx_result 911 ieee80211_rx_result
929 ieee80211_crypto_aes_cmac_decrypt(struct ieee8 912 ieee80211_crypto_aes_cmac_decrypt(struct ieee80211_rx_data *rx)
930 { 913 {
931 struct sk_buff *skb = rx->skb; 914 struct sk_buff *skb = rx->skb;
932 struct ieee80211_rx_status *status = I 915 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
933 struct ieee80211_key *key = rx->key; 916 struct ieee80211_key *key = rx->key;
934 struct ieee80211_mmie *mmie; 917 struct ieee80211_mmie *mmie;
935 u8 aad[20], mic[8], ipn[6]; 918 u8 aad[20], mic[8], ipn[6];
936 struct ieee80211_hdr *hdr = (struct ie 919 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
937 920
938 if (!ieee80211_is_mgmt(hdr->frame_cont 921 if (!ieee80211_is_mgmt(hdr->frame_control))
939 return RX_CONTINUE; 922 return RX_CONTINUE;
940 923
941 /* management frames are already linea 924 /* management frames are already linear */
942 925
943 if (skb->len < 24 + sizeof(*mmie)) 926 if (skb->len < 24 + sizeof(*mmie))
944 return RX_DROP_U_SHORT_CMAC; 927 return RX_DROP_U_SHORT_CMAC;
945 928
946 mmie = (struct ieee80211_mmie *) 929 mmie = (struct ieee80211_mmie *)
947 (skb->data + skb->len - sizeof 930 (skb->data + skb->len - sizeof(*mmie));
948 if (mmie->element_id != WLAN_EID_MMIE 931 if (mmie->element_id != WLAN_EID_MMIE ||
949 mmie->length != sizeof(*mmie) - 2) 932 mmie->length != sizeof(*mmie) - 2)
950 return RX_DROP_U_BAD_MMIE; /* 933 return RX_DROP_U_BAD_MMIE; /* Invalid MMIE */
951 934
952 bip_ipn_swap(ipn, mmie->sequence_numbe 935 bip_ipn_swap(ipn, mmie->sequence_number);
953 936
954 if (memcmp(ipn, key->u.aes_cmac.rx_pn, 937 if (memcmp(ipn, key->u.aes_cmac.rx_pn, 6) <= 0) {
955 key->u.aes_cmac.replays++; 938 key->u.aes_cmac.replays++;
956 return RX_DROP_U_REPLAY; 939 return RX_DROP_U_REPLAY;
957 } 940 }
958 941
959 if (!(status->flag & RX_FLAG_DECRYPTED 942 if (!(status->flag & RX_FLAG_DECRYPTED)) {
960 /* hardware didn't decrypt/ver 943 /* hardware didn't decrypt/verify MIC */
961 bip_aad(skb, aad); 944 bip_aad(skb, aad);
962 ieee80211_aes_cmac(key->u.aes_ 945 ieee80211_aes_cmac(key->u.aes_cmac.tfm, aad,
963 skb->data + 946 skb->data + 24, skb->len - 24, mic);
964 if (crypto_memneq(mic, mmie->m 947 if (crypto_memneq(mic, mmie->mic, sizeof(mmie->mic))) {
965 key->u.aes_cmac.icverr 948 key->u.aes_cmac.icverrors++;
966 return RX_DROP_U_MIC_F 949 return RX_DROP_U_MIC_FAIL;
967 } 950 }
968 } 951 }
969 952
970 memcpy(key->u.aes_cmac.rx_pn, ipn, 6); 953 memcpy(key->u.aes_cmac.rx_pn, ipn, 6);
971 954
972 /* Remove MMIE */ 955 /* Remove MMIE */
973 skb_trim(skb, skb->len - sizeof(*mmie) 956 skb_trim(skb, skb->len - sizeof(*mmie));
974 957
975 return RX_CONTINUE; 958 return RX_CONTINUE;
976 } 959 }
977 960
978 ieee80211_rx_result 961 ieee80211_rx_result
979 ieee80211_crypto_aes_cmac_256_decrypt(struct i 962 ieee80211_crypto_aes_cmac_256_decrypt(struct ieee80211_rx_data *rx)
980 { 963 {
981 struct sk_buff *skb = rx->skb; 964 struct sk_buff *skb = rx->skb;
982 struct ieee80211_rx_status *status = I 965 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
983 struct ieee80211_key *key = rx->key; 966 struct ieee80211_key *key = rx->key;
984 struct ieee80211_mmie_16 *mmie; 967 struct ieee80211_mmie_16 *mmie;
985 u8 aad[20], mic[16], ipn[6]; 968 u8 aad[20], mic[16], ipn[6];
986 struct ieee80211_hdr *hdr = (struct ie 969 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
987 970
988 if (!ieee80211_is_mgmt(hdr->frame_cont 971 if (!ieee80211_is_mgmt(hdr->frame_control))
989 return RX_CONTINUE; 972 return RX_CONTINUE;
990 973
991 /* management frames are already linea 974 /* management frames are already linear */
992 975
993 if (skb->len < 24 + sizeof(*mmie)) 976 if (skb->len < 24 + sizeof(*mmie))
994 return RX_DROP_U_SHORT_CMAC256 977 return RX_DROP_U_SHORT_CMAC256;
995 978
996 mmie = (struct ieee80211_mmie_16 *) 979 mmie = (struct ieee80211_mmie_16 *)
997 (skb->data + skb->len - sizeof 980 (skb->data + skb->len - sizeof(*mmie));
998 if (mmie->element_id != WLAN_EID_MMIE 981 if (mmie->element_id != WLAN_EID_MMIE ||
999 mmie->length != sizeof(*mmie) - 2) 982 mmie->length != sizeof(*mmie) - 2)
1000 return RX_DROP_U_BAD_MMIE; /* 983 return RX_DROP_U_BAD_MMIE; /* Invalid MMIE */
1001 984
1002 bip_ipn_swap(ipn, mmie->sequence_numb 985 bip_ipn_swap(ipn, mmie->sequence_number);
1003 986
1004 if (memcmp(ipn, key->u.aes_cmac.rx_pn 987 if (memcmp(ipn, key->u.aes_cmac.rx_pn, 6) <= 0) {
1005 key->u.aes_cmac.replays++; 988 key->u.aes_cmac.replays++;
1006 return RX_DROP_U_REPLAY; 989 return RX_DROP_U_REPLAY;
1007 } 990 }
1008 991
1009 if (!(status->flag & RX_FLAG_DECRYPTE 992 if (!(status->flag & RX_FLAG_DECRYPTED)) {
1010 /* hardware didn't decrypt/ve 993 /* hardware didn't decrypt/verify MIC */
1011 bip_aad(skb, aad); 994 bip_aad(skb, aad);
1012 ieee80211_aes_cmac_256(key->u 995 ieee80211_aes_cmac_256(key->u.aes_cmac.tfm, aad,
1013 skb->d 996 skb->data + 24, skb->len - 24, mic);
1014 if (crypto_memneq(mic, mmie-> 997 if (crypto_memneq(mic, mmie->mic, sizeof(mmie->mic))) {
1015 key->u.aes_cmac.icver 998 key->u.aes_cmac.icverrors++;
1016 return RX_DROP_U_MIC_ 999 return RX_DROP_U_MIC_FAIL;
1017 } 1000 }
1018 } 1001 }
1019 1002
1020 memcpy(key->u.aes_cmac.rx_pn, ipn, 6) 1003 memcpy(key->u.aes_cmac.rx_pn, ipn, 6);
1021 1004
1022 /* Remove MMIE */ 1005 /* Remove MMIE */
1023 skb_trim(skb, skb->len - sizeof(*mmie 1006 skb_trim(skb, skb->len - sizeof(*mmie));
1024 1007
1025 return RX_CONTINUE; 1008 return RX_CONTINUE;
1026 } 1009 }
1027 1010
1028 ieee80211_tx_result 1011 ieee80211_tx_result
1029 ieee80211_crypto_aes_gmac_encrypt(struct ieee 1012 ieee80211_crypto_aes_gmac_encrypt(struct ieee80211_tx_data *tx)
1030 { 1013 {
1031 struct sk_buff *skb; 1014 struct sk_buff *skb;
1032 struct ieee80211_tx_info *info; 1015 struct ieee80211_tx_info *info;
1033 struct ieee80211_key *key = tx->key; 1016 struct ieee80211_key *key = tx->key;
1034 struct ieee80211_mmie_16 *mmie; 1017 struct ieee80211_mmie_16 *mmie;
1035 struct ieee80211_hdr *hdr; 1018 struct ieee80211_hdr *hdr;
1036 u8 aad[GMAC_AAD_LEN]; 1019 u8 aad[GMAC_AAD_LEN];
1037 u64 pn64; 1020 u64 pn64;
1038 u8 nonce[GMAC_NONCE_LEN]; 1021 u8 nonce[GMAC_NONCE_LEN];
1039 1022
1040 if (WARN_ON(skb_queue_len(&tx->skbs) 1023 if (WARN_ON(skb_queue_len(&tx->skbs) != 1))
1041 return TX_DROP; 1024 return TX_DROP;
1042 1025
1043 skb = skb_peek(&tx->skbs); 1026 skb = skb_peek(&tx->skbs);
1044 1027
1045 info = IEEE80211_SKB_CB(skb); 1028 info = IEEE80211_SKB_CB(skb);
1046 1029
1047 if (info->control.hw_key && !! 1030 if (info->control.hw_key)
1048 !(key->conf.flags & IEEE80211_KEY <<
1049 return TX_CONTINUE; 1031 return TX_CONTINUE;
1050 1032
1051 if (WARN_ON(skb_tailroom(skb) < sizeo 1033 if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie)))
1052 return TX_DROP; 1034 return TX_DROP;
1053 1035
1054 mmie = skb_put(skb, sizeof(*mmie)); 1036 mmie = skb_put(skb, sizeof(*mmie));
1055 mmie->element_id = WLAN_EID_MMIE; 1037 mmie->element_id = WLAN_EID_MMIE;
1056 mmie->length = sizeof(*mmie) - 2; 1038 mmie->length = sizeof(*mmie) - 2;
1057 mmie->key_id = cpu_to_le16(key->conf. 1039 mmie->key_id = cpu_to_le16(key->conf.keyidx);
1058 1040
1059 /* PN = PN + 1 */ 1041 /* PN = PN + 1 */
1060 pn64 = atomic64_inc_return(&key->conf 1042 pn64 = atomic64_inc_return(&key->conf.tx_pn);
1061 1043
1062 bip_ipn_set64(mmie->sequence_number, 1044 bip_ipn_set64(mmie->sequence_number, pn64);
1063 <<
1064 if (info->control.hw_key) <<
1065 return TX_CONTINUE; <<
1066 1045
1067 bip_aad(skb, aad); 1046 bip_aad(skb, aad);
1068 1047
1069 hdr = (struct ieee80211_hdr *)skb->da 1048 hdr = (struct ieee80211_hdr *)skb->data;
1070 memcpy(nonce, hdr->addr2, ETH_ALEN); 1049 memcpy(nonce, hdr->addr2, ETH_ALEN);
1071 bip_ipn_swap(nonce + ETH_ALEN, mmie-> 1050 bip_ipn_swap(nonce + ETH_ALEN, mmie->sequence_number);
1072 1051
1073 /* MIC = AES-GMAC(IGTK, AAD || Manage 1052 /* MIC = AES-GMAC(IGTK, AAD || Management Frame Body || MMIE, 128) */
1074 if (ieee80211_aes_gmac(key->u.aes_gma 1053 if (ieee80211_aes_gmac(key->u.aes_gmac.tfm, aad, nonce,
1075 skb->data + 24 1054 skb->data + 24, skb->len - 24, mmie->mic) < 0)
1076 return TX_DROP; 1055 return TX_DROP;
1077 1056
1078 return TX_CONTINUE; 1057 return TX_CONTINUE;
1079 } 1058 }
1080 1059
1081 ieee80211_rx_result 1060 ieee80211_rx_result
1082 ieee80211_crypto_aes_gmac_decrypt(struct ieee 1061 ieee80211_crypto_aes_gmac_decrypt(struct ieee80211_rx_data *rx)
1083 { 1062 {
1084 struct sk_buff *skb = rx->skb; 1063 struct sk_buff *skb = rx->skb;
1085 struct ieee80211_rx_status *status = 1064 struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
1086 struct ieee80211_key *key = rx->key; 1065 struct ieee80211_key *key = rx->key;
1087 struct ieee80211_mmie_16 *mmie; 1066 struct ieee80211_mmie_16 *mmie;
1088 u8 aad[GMAC_AAD_LEN], *mic, ipn[6], n 1067 u8 aad[GMAC_AAD_LEN], *mic, ipn[6], nonce[GMAC_NONCE_LEN];
1089 struct ieee80211_hdr *hdr = (struct i 1068 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
1090 1069
1091 if (!ieee80211_is_mgmt(hdr->frame_con 1070 if (!ieee80211_is_mgmt(hdr->frame_control))
1092 return RX_CONTINUE; 1071 return RX_CONTINUE;
1093 1072
1094 /* management frames are already line 1073 /* management frames are already linear */
1095 1074
1096 if (skb->len < 24 + sizeof(*mmie)) 1075 if (skb->len < 24 + sizeof(*mmie))
1097 return RX_DROP_U_SHORT_GMAC; 1076 return RX_DROP_U_SHORT_GMAC;
1098 1077
1099 mmie = (struct ieee80211_mmie_16 *) 1078 mmie = (struct ieee80211_mmie_16 *)
1100 (skb->data + skb->len - sizeo 1079 (skb->data + skb->len - sizeof(*mmie));
1101 if (mmie->element_id != WLAN_EID_MMIE 1080 if (mmie->element_id != WLAN_EID_MMIE ||
1102 mmie->length != sizeof(*mmie) - 2 1081 mmie->length != sizeof(*mmie) - 2)
1103 return RX_DROP_U_BAD_MMIE; /* 1082 return RX_DROP_U_BAD_MMIE; /* Invalid MMIE */
1104 1083
1105 bip_ipn_swap(ipn, mmie->sequence_numb 1084 bip_ipn_swap(ipn, mmie->sequence_number);
1106 1085
1107 if (memcmp(ipn, key->u.aes_gmac.rx_pn 1086 if (memcmp(ipn, key->u.aes_gmac.rx_pn, 6) <= 0) {
1108 key->u.aes_gmac.replays++; 1087 key->u.aes_gmac.replays++;
1109 return RX_DROP_U_REPLAY; 1088 return RX_DROP_U_REPLAY;
1110 } 1089 }
1111 1090
1112 if (!(status->flag & RX_FLAG_DECRYPTE 1091 if (!(status->flag & RX_FLAG_DECRYPTED)) {
1113 /* hardware didn't decrypt/ve 1092 /* hardware didn't decrypt/verify MIC */
1114 bip_aad(skb, aad); 1093 bip_aad(skb, aad);
1115 1094
1116 memcpy(nonce, hdr->addr2, ETH 1095 memcpy(nonce, hdr->addr2, ETH_ALEN);
1117 memcpy(nonce + ETH_ALEN, ipn, 1096 memcpy(nonce + ETH_ALEN, ipn, 6);
1118 1097
1119 mic = kmalloc(GMAC_MIC_LEN, G 1098 mic = kmalloc(GMAC_MIC_LEN, GFP_ATOMIC);
1120 if (!mic) 1099 if (!mic)
1121 return RX_DROP_U_OOM; 1100 return RX_DROP_U_OOM;
1122 if (ieee80211_aes_gmac(key->u 1101 if (ieee80211_aes_gmac(key->u.aes_gmac.tfm, aad, nonce,
1123 skb->d 1102 skb->data + 24, skb->len - 24,
1124 mic) < 1103 mic) < 0 ||
1125 crypto_memneq(mic, mmie-> 1104 crypto_memneq(mic, mmie->mic, sizeof(mmie->mic))) {
1126 key->u.aes_gmac.icver 1105 key->u.aes_gmac.icverrors++;
1127 kfree(mic); 1106 kfree(mic);
1128 return RX_DROP_U_MIC_ 1107 return RX_DROP_U_MIC_FAIL;
1129 } 1108 }
1130 kfree(mic); 1109 kfree(mic);
1131 } 1110 }
1132 1111
1133 memcpy(key->u.aes_gmac.rx_pn, ipn, 6) 1112 memcpy(key->u.aes_gmac.rx_pn, ipn, 6);
1134 1113
1135 /* Remove MMIE */ 1114 /* Remove MMIE */
1136 skb_trim(skb, skb->len - sizeof(*mmie 1115 skb_trim(skb, skb->len - sizeof(*mmie));
1137 1116
1138 return RX_CONTINUE; 1117 return RX_CONTINUE;
1139 } 1118 }
1140 1119
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.