ath10k: implement PN replay protection for SDIO
cover ath10k: implement PN replay protection for SDIO
HTT High Latency devices (SDIO and USB) need PN replay protection in host driver, implemented in this patchset. Also support for QCA6174 hw3.2 SDIO devices is enabled as now all the necessary pieces have now been implemented.
For replay protection of TKIP, CCMP and GCMP ath10k_htt_rx_pn_check_replay_hl() will check PN to see if the frame is received before. This is implemented in patch "ath10k: add PN replay protection for high latency devices"
The replay protection on fragmented MSDU with CCMP and GCMP is done by ath10k_htt_rx_proc_rx_frag_ind_hl(), implemented in patch "ath10k: add fragment packet handler for high latency". The fragments will be reassembled by mac80211 in ieee80211_rx_h_defragment(). Also mac80211 will verify the Michael MIC in ieee80211_rx_h_michael_mic_verify().
Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1.
Wen Gong (5):
ath10k: add struct for high latency PN replay protection
ath10k: add handler for HTT_T2H_MSG_TYPE_SEC_IND event
ath10k: add PN replay protection for high latency devices
ath10k: add fragmentation handler for high latency devices
ath10k: enable QCA6174 hw3.2 SDIO hardware
drivers/net/wireless/ath/ath10k/core.c | 27 +++ drivers/net/wireless/ath/ath10k/core.h | 8 + drivers/net/wireless/ath/ath10k/htt.h | 56 ++++- drivers/net/wireless/ath/ath10k/htt_rx.c | 373 ++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/sdio.c | 2 +- 6 files changed, 460 insertions(+), 7 deletions(-)
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH 1/5 ath10k: add struct for high latency PN replay protection
From: Wen Gong <[email protected]>
Add the struct for PN replay protection and fragment packet handler.
Also fix the bitmask of HTT_RX_DESC_HL_INFO_MCAST_BCAST to match what's currently used by SDIO firmware. The defines are not used yet so it's safe to modify them. Remove the conflicting HTT_RX_DESC_HL_INFO_FRAGMENT as
it's not either used in ath10k.
Tested on QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/core.h | 8 +++++++ drivers/net/wireless/ath/ath10k/htt.h | 43 ++++++++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/core.h +8 -0
@@ -400,6 +400,14 @@ struct ath10k_peer {/* protected by ar->data_lock */ struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX +1 ]; +union htt_rx_pn_t tids_last_pn[ATH10K_TXRX_NUM_EXT_TIDS ]; +bool tids_last_pn_valid[ATH10K_TXRX_NUM_EXT_TIDS ]; +union htt_rx_pn_t frag_tids_last_pn[ATH10K_TXRX_NUM_EXT_TIDS ]; +u32 frag_tids_seq[ATH10K_TXRX_NUM_EXT_TIDS ]; +struct { +enum htt_security_types sec_type; +int pn_len; + } rx_pn[ATH10K_HTT_TXRX_PEER_SECURITY_MAX ]; };struct ath10k_txq {
drivers/net/wireless/ath/ath10k/htt.h +39 -4
73 lines not on this page · raw message
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCH 1/5] ath10k: add struct for high latency PN replay protection
Quoted 8 lines · Kalle Valo
Add the struct for PN replay protection and fragment packet handler.
Also fix the bitmask of
HTT_RX_DESC_HL_INFO_MCAST_BCASTto match what's currently used by SDIO firmware. The defines are not used yet so it's safe to modify them. Remove the conflictingHTT_RX_DESC_HL_INFO_FRAGMENTas
it's not either used in ath10k.
Quoted 4 lines
Tested on QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1.
Signed-off-by Wen Gong <[email protected]>Signed-off-by Kalle Valo <[email protected]>
5 patches applied to ath-next branch of ath.git, thanks.
e1bddde9737a ath10k: add struct for high latency PN replay protection 28ce53b6cfda ath10k: add handler for HTT_T2H_MSG_TYPE_SEC_IND event 130c77495708 ath10k: add PN replay protection for high latency devices 33f9747291ff ath10k: add fragmentation handler for high latency devices a8b10da05cbe ath10k: enable QCA6174 hw3.2 SDIO hardware
Signature · 9 lines
https://patchwork.kernel.org/patch/10918335/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCH 1/5] ath10k: add struct for high latency PN replay protection
In reply to Kalle ValoQuoted 8 lines · Kalle Valo
Add the struct for PN replay protection and fragment packet handler.
Also fix the bitmask of
HTT_RX_DESC_HL_INFO_MCAST_BCASTto match what's currently used by SDIO firmware. The defines are not used yet so it's safe to modify them. Remove the conflictingHTT_RX_DESC_HL_INFO_FRAGMENTas
it's not either used in ath10k.
Quoted 4 lines
Tested on QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1.
Signed-off-by Wen Gong <[email protected]>Signed-off-by Kalle Valo <[email protected]>
5 patches applied to ath-next branch of ath.git, thanks.
e1bddde9737a ath10k: add struct for high latency PN replay protection 28ce53b6cfda ath10k: add handler for HTT_T2H_MSG_TYPE_SEC_IND event 130c77495708 ath10k: add PN replay protection for high latency devices 33f9747291ff ath10k: add fragmentation handler for high latency devices a8b10da05cbe ath10k: enable QCA6174 hw3.2 SDIO hardware
Signature · 3 lines
https://patchwork.kernel.org/patch/10918335/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/5 ath10k: add handler for HTT_T2H_MSG_TYPE_SEC_IND event
In reply to Kalle ValoFrom: Wen Gong <[email protected]>
Add the handler for HTT_T2H_MSG_TYPE_SEC_IND event from firmware, which stores PN for replay check implemented in the following patch.
Tested on QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
drivers/net/wireless/ath/ath10k/htt_rx.c +46 -0
@@ -3267,6 +3267,51 @@ static void ath10k_fetch_10_2_tx_stats(struct ath10k *ar, u8 *data)rcu_read_unlock (); } +static int ath10k_htt_rx_pn_len (enum htt_security_types sec_type) +{ +switch (sec_type) { +case HTT_SECURITY_TKIP : +case HTT_SECURITY_TKIP_NOMIC : +case HTT_SECURITY_AES_CCMP : +return 48 ; +default : +return 0 ; + } +} + +static void ath10k_htt_rx_sec_ind_handler (struct ath10k *ar, +struct htt_security_indication *ev) +{ +enum htt_txrx_sec_cast_type sec_index; +enum htt_security_types sec_type; +struct ath10k_peer *peer; + +spin_lock_bh (&ar->data_lock); + + peer =ath10k_peer_find_by_id (ar,__le16_to_cpu (ev->peer_id)); +if (!peer) { +ath10k_warn (ar,"failed to find peer id %d for security indication" , +__le16_to_cpu (ev->peer_id)); + goto out; + } + + sec_type =MS (ev->flags,HTT_SECURITY_TYPE ); + +if (ev->flags &HTT_SECURITY_IS_UNICAST ) + sec_index =HTT_TXRX_SEC_UCAST ; +else + sec_index =HTT_TXRX_SEC_MCAST ; + + peer->rx_pn[sec_index].sec_type = sec_type; + peer->rx_pn[sec_index].pn_len =ath10k_htt_rx_pn_len (sec_type); + +memset (peer->tids_last_pn_valid,0 ,sizeof (peer->tids_last_pn_valid)); +memset (peer->tids_last_pn,0 ,sizeof (peer->tids_last_pn)); + +out: +spin_unlock_bh (&ar->data_lock); +} +bool ath10k_htt_t2h_msg_handler (struct ath10k *ar,struct sk_buff *skb) {struct ath10k_htt *htt = &ar->htt;
@@ -3360,6 +3405,7 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)struct ath10k *ar = htt->ar;struct htt_security_indication *ev = &resp->security_indication; +ath10k_htt_rx_sec_ind_handler (ar, ev); ath10k_dbg(ar, ATH10K_DBG_HTT, "sec ind peer_id %d unicast %d type %d\n", __le16_to_cpu(ev->peer_id),
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH 3/5 ath10k: add PN replay protection for high latency devices
In reply to Kalle ValoFrom: Wen Gong <[email protected]>
On high latency devices (SDIO, USB) ath10k did not do PN replay check, a data frame with an invalid PN number was not discard as it should have been. So this patch implements PN replay in ath10k. PN replay check for fragmented frames is implemented in followup patch.
With low latency devices (PCI, AHB) hardware can store the data frames's content to host memory directly and the firmware can fully reorder data frames, and do PN replay check at the same time. But for high latency devices all data frames will be received and stored in firmware's memory and it is hard to do full reorder because of the memory size limitations in the firmware. This is why the PN replay protections needs to be implemented in host driver.
Tested on QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 97 +++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath10k/htt_rx.c +95 -2
@@ -2061,9 +2061,91 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)return 0 ; } +static void ath10k_htt_rx_mpdu_desc_pn_hl (struct htt_hl_rx_desc *rx_desc, +union htt_rx_pn_t *pn, +int pn_len_bits) +{ +switch (pn_len_bits) { +case 48 : + pn->pn48 =__le32_to_cpu (rx_desc->pn_31_0) + + ((u64)(__le32_to_cpu (rx_desc->u0.pn_63_32) &0xFFFF ) <<32 ); +break ; +case 24 : + pn->pn24 =__le32_to_cpu (rx_desc->pn_31_0); +break ; + }; +} + +static bool ath10k_htt_rx_pn_cmp48 (union htt_rx_pn_t *new_pn, +union htt_rx_pn_t *old_pn) +{ +return ((new_pn->pn48 &0xffffffffffffULL ) <= + (old_pn->pn48 &0xffffffffffffULL )); +} + +static bool ath10k_htt_rx_pn_check_replay_hl (struct ath10k *ar, +struct ath10k_peer *peer, +struct htt_rx_indication_hl *rx) +{ +bool last_pn_valid, pn_invalid = false; +enum htt_txrx_sec_cast_type sec_index; +enum htt_security_types sec_type; +union htt_rx_pn_t new_pn = {0 }; +struct htt_hl_rx_desc *rx_desc; +union htt_rx_pn_t *last_pn; +u32 rx_desc_info, tid; +int num_mpdu_ranges; + +lockdep_assert_held (&ar->data_lock); + +if (!peer) +return false; + +if (!(rx->fw_desc.flags &FW_RX_DESC_FLAGS_FIRST_MSDU )) +return false; + + num_mpdu_ranges =MS (__le32_to_cpu (rx->hdr.info1), +HTT_RX_INDICATION_INFO1_NUM_MPDU_RANGES ); + + rx_desc = (struct htt_hl_rx_desc *)&rx->mpdu_ranges[num_mpdu_ranges]; + rx_desc_info =__le32_to_cpu (rx_desc->info); + +if (!MS (rx_desc_info,HTT_RX_DESC_HL_INFO_ENCRYPTED )) +return false; + + tid =MS (rx->hdr.info0,HTT_RX_INDICATION_INFO0_EXT_TID ); + last_pn_valid = peer->tids_last_pn_valid[tid]; + last_pn = &peer->tids_last_pn[tid]; + +if (MS (rx_desc_info,HTT_RX_DESC_HL_INFO_MCAST_BCAST )) + sec_index =HTT_TXRX_SEC_MCAST ; +else + sec_index =HTT_TXRX_SEC_UCAST ; + + sec_type = peer->rx_pn[sec_index].sec_type; +ath10k_htt_rx_mpdu_desc_pn_hl (rx_desc, &new_pn, peer->rx_pn[sec_index].pn_len); + +if (sec_type !=HTT_SECURITY_AES_CCMP && + sec_type !=HTT_SECURITY_TKIP && + sec_type !=HTT_SECURITY_TKIP_NOMIC ) +return false; + +if (last_pn_valid) + pn_invalid =ath10k_htt_rx_pn_cmp48 (&new_pn, last_pn); +else + peer->tids_last_pn_valid[tid] =1 ; + +if (!pn_invalid) + last_pn->pn48 = new_pn.pn48; + +return pn_invalid; +} +static bool ath10k_htt_rx_proc_rx_ind_hl (struct ath10k_htt *htt,struct htt_rx_indication_hl *rx, -struct sk_buff *skb) +struct sk_buff *skb, +enum htt_rx_pn_check_type check_pn_type, +enum htt_rx_tkip_demic_type tkip_mic_type) {struct ath10k *ar = htt->ar;struct ath10k_peer *peer;
@@ -2107,6 +2189,10 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt, goto err; } +if (check_pn_type ==HTT_RX_PN_CHECK && +ath10k_htt_rx_pn_check_replay_hl (ar, peer, rx)) + goto err; +/* Strip off all headers before the MAC header before delivery to * mac80211 */
@@ -2114,6 +2200,7 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,sizeof (rx->ppdu) +sizeof (rx->prefix) +sizeof (rx->fw_desc) +sizeof (*mpdu_ranges) * num_mpdu_ranges + rx_desc_len; +skb_pull (skb, tot_hdr_len); hdr = (struct ieee80211_hdr *)skb->data;
@@ -2162,6 +2249,10 @@ static bool ath10k_htt_rx_proc_rx_ind_hl(struct ath10k_htt *htt,RX_FLAG_MMIC_STRIPPED ; } +if (tkip_mic_type ==HTT_RX_TKIP_MIC ) + rx_status->flag &= ~RX_FLAG_IV_STRIPPED & + ~RX_FLAG_MMIC_STRIPPED ; +ieee80211_rx_ni (ar->hw, skb);/* We have delivered the skb to the upper layers (mac80211) so we
@@ -3343,7 +3434,9 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)if (ar->bus_param.dev_type ==ATH10K_DEV_TYPE_HL )return ath10k_htt_rx_proc_rx_ind_hl (htt, &resp->rx_ind_hl, - skb); + skb, +HTT_RX_PN_CHECK , +HTT_RX_NON_TKIP_MIC );else ath10k_htt_rx_proc_rx_ind_ll (htt, &resp->rx_ind);break ;
Signature · 1 line
2.7.4
PATCH 4/5 ath10k: add fragmentation handler for high latency devices
In reply to Kalle ValoFrom: Wen Gong <[email protected]>
On high latency devices (SDIO, USB) ath10k did not handle fragmented frames and all fragmented frames on receive path were lost in ath10k. Even a simple ping test failed with fragmentation.
The fragmented packets are decapsulated based on the security mode, then the PN is checked and the fragmented frame is passed to mac80211. mac80211 in ieee80211_rx_h_defragment() will then combine the fragment frames and forward to upper layers.
Tested on QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/htt.h | 13 ++ drivers/net/wireless/ath/ath10k/htt_rx.c | 230 +++++++++++++++++++++++++++++++ 2 files changed, 243 insertions(+)
drivers/net/wireless/ath/ath10k/htt.h +13 -0
@@ -2092,6 +2092,9 @@ struct ath10k_htt_rx_ops { int idx);void * (*htt_get_vaddr_ring)(struct ath10k_htt *htt);void (*htt_reset_paddrs_ring)(struct ath10k_htt *htt,int idx); +bool (*htt_rx_proc_rx_frag_ind)(struct ath10k_htt *htt, +struct htt_rx_fragment_indication *rx, +struct sk_buff *skb); };static inline size_t ath10k_htt_get_rx_ring_size (struct ath10k_htt *htt)
@@ -2131,6 +2134,16 @@ static inline void ath10k_htt_reset_paddrs_ring(struct ath10k_htt *htt, int idx) htt->rx_ops->htt_reset_paddrs_ring (htt, idx); } +static inline bool ath10k_htt_rx_proc_rx_frag_ind (struct ath10k_htt *htt, +struct htt_rx_fragment_indication *rx, +struct sk_buff *skb) +{ +if (!htt->rx_ops->htt_rx_proc_rx_frag_ind) +return true; + +return htt->rx_ops->htt_rx_proc_rx_frag_ind (htt, rx, skb); +} +#define RX_HTT_HDR_STATUS_LEN 64/* This structure layout is programmed via rx ring setup
drivers/net/wireless/ath/ath10k/htt_rx.c +230 -0
248 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 5/5 ath10k: enable QCA6174 hw3.2 SDIO hardware
In reply to Kalle ValoFrom: Wen Gong <[email protected]>
After implementing PN replay check we can enable SDIO support on QCA6174. Tested with client mode on all security modes, and fragmentation as well. AP mode does not work yet.
Also tone down the warning about SDIO being not ready yet.
Tested on QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1. AP mode is not working yet.
--- drivers/net/wireless/ath/ath10k/core.c | 27 +++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/sdio.c | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/core.c +27 -0
@@ -154,6 +154,33 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .fw_diag_ce_download = false, }, { + .id = QCA6174_HW_3_2_VERSION, + .dev_id = QCA6174_3_2_DEVICE_ID, + .bus = ATH10K_BUS_SDIO, + .name = "qca6174 hw3.2 sdio", + .patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR, + .uart_pin = 19, + .otp_exe_param = 0, + .channel_counters_freq_hz = 88000, + .max_probe_resp_desc_thres = 0, + .cal_data_len = 0, + .fw = { + .dir = QCA6174_HW_3_0_FW_DIR, + .board = QCA6174_HW_3_0_BOARD_DATA_FILE, + .board_size = QCA6174_BOARD_DATA_SZ, + .board_ext_size = QCA6174_BOARD_EXT_DATA_SZ, + }, + .hw_ops = &qca6174_ops, + .hw_clk = qca6174_clk, + .target_cpu_freq = 176000000, + .decap_align_bytes = 4, + .n_cipher_suites = 8, + .num_peers = 10, + .ast_skid_limit = 0x10, + .num_wds_entries = 0x20, + .uart_pin_workaround = true, + }, + { .id = QCA6174_HW_2_1_VERSION, .dev_id = QCA6164_2_1_DEVICE_ID, .bus = ATH10K_BUS_PCI,
drivers/net/wireless/ath/ath10k/hw.h +1 -0
@@ -24,6 +24,7 @@ enum ath10k_bus {#define QCA988X_2_0_DEVICE_ID (0x003c)#define QCA6164_2_1_DEVICE_ID (0x0041)#define QCA6174_2_1_DEVICE_ID (0x003e) +#define QCA6174_3_2_DEVICE_ID (0x0042)#define QCA99X0_2_0_DEVICE_ID (0x0040)#define QCA9888_2_0_DEVICE_ID (0x0056)#define QCA9984_1_0_DEVICE_ID (0x0046)
drivers/net/wireless/ath/ath10k/sdio.c +1 -1
@@ -2059,7 +2059,7 @@ static int ath10k_sdio_probe(struct sdio_func *func, }/* TODO: remove this once SDIO support is fully implemented */ -ath10k_warn (ar,"WARNING: ath10k SDIO support is incomplete, don't expect anything to work!\n" ); +ath10k_warn (ar,"WARNING: ath10k SDIO support is work-in-progress, problems may arise!\n" );return 0 ;
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k