ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start
PATCH 1/1 ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start
the tlv len is set to the total len of the wmi cmd, it will trigger firmware crash, correct the tlv len.
Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00017-QCARMSWP-1 and QCA6174 PCIE with firmware WLAN.RM.4.4.1-00110-QCARMSWPZ-1.
--- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/wmi-tlv.c +4 -1
@@ -3707,6 +3707,7 @@ ath10k_wmi_tlv_op_gen_config_pno_start(struct ath10k *ar,struct wmi_tlv *tlv;struct sk_buff *skb;__le32 *channel_list; +u16 tlv_len;size_t len;void *ptr;u32 i;
@@ -3764,10 +3765,12 @@ ath10k_wmi_tlv_op_gen_config_pno_start(struct ath10k *ar,/* nlo_configured_parameters(nlo_list) */ cmd->no_of_ssids =__cpu_to_le32 (min_t (u8, pno->uc_networks_count,WMI_NLO_MAX_SSIDS )); + tlv_len =__le32_to_cpu (cmd->no_of_ssids) * +sizeof (struct nlo_configured_parameters ); tlv = ptr; tlv->tag =__cpu_to_le16 (WMI_TLV_TAG_ARRAY_STRUCT ); - tlv->len =__cpu_to_le16 (len); + tlv->len =__cpu_to_le16 (tlv_len); ptr +=sizeof (*tlv); nlo_list = ptr;
Signature · 7 lines
2.23.0 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 10 lines · Wen Gong
the tlv len is set to the total len of the wmi cmd, it will trigger firmware crash, correct the tlv len.
Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00017-QCARMSWP-1 and QCA6174 PCIE with firmware WLAN.RM.4.4.1-00110-QCARMSWPZ-1.
Fixes ce834e280f2f875 ("ath10k: support NET_DETECT WoWLAN feature")Signed-off-by Wen Gong <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
e01cc82c4d1e ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start
Signature · 3 lines
https://patchwork.kernel.org/patch/11232379/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 10 lines · Wen Gong
the tlv len is set to the total len of the wmi cmd, it will trigger firmware crash, correct the tlv len.
Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00017-QCARMSWP-1 and QCA6174 PCIE with firmware WLAN.RM.4.4.1-00110-QCARMSWPZ-1.
Fixes ce834e280f2f875 ("ath10k: support NET_DETECT WoWLAN feature")Signed-off-by Wen Gong <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
e01cc82c4d1e ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start
Signature · 9 lines
https://patchwork.kernel.org/patch/11232379/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k