ath11k: fix wmi service ready ext tlv parsing
PATCH 1/1 ath11k: fix wmi service ready ext tlv parsing
The current ath11k driver failed to parse wmi_tlv_svc_rdy_ext_parse if there is change in wmi_mac_phy_capabilities length with below error.
ath11k c000000.wifi1: failed to extract mac caps, idx :0 ath11k c000000.wifi1: failed to parse tlv -22
Signed-off-by Anilkumar Kolli <[email protected]>
--- drivers/net/wireless/ath/ath11k/wmi.c | 14 +++++++++++--- drivers/net/wireless/ath/ath11k/wmi.h | 1 - 2 files changed, 11 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath11k/wmi.c +11 -3
@@ -310,7 +310,7 @@ static int ath11k_pull_svc_ready_ext(struct ath11k_pdev_wmi *wmi_handle,if (phy_id >= hal_reg_caps->num_phy)return -EINVAL ; - mac_phy_caps = &wmi_mac_phy_caps[phy_idx]; + mac_phy_caps = wmi_mac_phy_caps + phy_idx; pdev->pdev_id = mac_phy_caps->pdev_id; pdev_cap->supported_bands = mac_phy_caps->supported_bands;
@@ -2837,6 +2837,15 @@ static int ath11k_wmi_tlv_mac_phy_caps_parse(struct ath11k_base *soc,if (svc_rdy_ext->n_mac_phy_caps >= svc_rdy_ext->tot_phy_id)return -ENOBUFS ; + len =min_t (u16, len,sizeof (struct wmi_mac_phy_capabilities )); +if (!svc_rdy_ext->n_mac_phy_caps) { + svc_rdy_ext->mac_phy_caps =kzalloc ((svc_rdy_ext->tot_phy_id) * len, +GFP_ATOMIC ); +if (!svc_rdy_ext->mac_phy_caps) +return -ENOMEM ; + } + +memcpy (svc_rdy_ext->mac_phy_caps + svc_rdy_ext->n_mac_phy_caps, ptr, len); svc_rdy_ext->n_mac_phy_caps++;return 0 ; }
@@ -2970,8 +2979,6 @@ static int ath11k_wmi_tlv_svc_rdy_ext_parse(struct ath11k_base *ab, svc_rdy_ext->hw_mode_done = true; }else if (!svc_rdy_ext->mac_phy_done) { svc_rdy_ext->n_mac_phy_caps =0 ; - svc_rdy_ext->mac_phy_caps = - (struct wmi_mac_phy_capabilities *)ptr; ret =ath11k_wmi_tlv_iter (ab, ptr, len, ath11k_wmi_tlv_mac_phy_caps_parse, svc_rdy_ext);
@@ -3012,6 +3019,7 @@ static int ath11k_service_ready_ext_event(struct ath11k_base *ab,return ret; } +kfree (svc_rdy_ext.mac_phy_caps);return 0 ; }
drivers/net/wireless/ath/ath11k/wmi.h +0 -1
@@ -2241,7 +2241,6 @@ struct wmi_hw_mode_capabilities {#define WMI_MAX_HECAP_PHY_SIZE (3)struct wmi_mac_phy_capabilities { -u32 tlv_header;u32 hw_mode_id;u32 pdev_id;u32 phy_id;
Signature · 7 lines
1.9.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 9 lines · Anilkumar Kolli
The current ath11k driver failed to parse
wmi_tlv_svc_rdy_ext_parseif there is change inwmi_mac_phy_capabilitieslength with below error.ath11k c000000.wifi1: failed to extract mac caps, idx :0 ath11k c000000.wifi1: failed to parse tlv -22
Signed-off-by Anilkumar Kolli <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath11k-post-bringup branch of ath.git, thanks.
99c092c51811 ath11k: fix wmi service ready ext tlv parsing
Signature · 9 lines
https://patchwork.kernel.org/patch/11070187/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k