wifi: ath12k: Fix for out-of bound access error
PATCH v3 1/1 wifi: ath12k: Fix for out-of bound access error
Selfgen stats are placed in a buffer using print_array_to_buf_index() function. Array length parameter passed to the function is too big, resulting in possible out-of bound memory error.
Decreasing buffer size by one fixes faulty upper bound of passed array.
Discovered in coverity scan, CID 1600742 and CID 1600758
---
Changes in v3:
- Code style: added spaces before and after '-'
- Improved commit msg
- Fixed same error in different function
- Link to previous discussion: https://lore.kernel.org/all/[email protected]/
--- drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c +2 -2
@@ -1562,7 +1562,7 @@ ath12k_htt_print_tx_selfgen_ac_stats_tlv(const void *tag_buf, u16 tag_len, le32_to_cpu(htt_stats_buf->ac_mu_mimo_ndp)); len +=print_array_to_buf_index (buf, len,"ac_mu_mimo_brpollX_tried = " ,1 , htt_stats_buf->ac_mu_mimo_brpoll, -ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS ,"\n\n" ); +ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS -1 ,"\n\n" ); stats_req->buf_len = len; }
@@ -1590,7 +1590,7 @@ ath12k_htt_print_tx_selfgen_ax_stats_tlv(const void *tag_buf, u16 tag_len, le32_to_cpu(htt_stats_buf->ax_mu_mimo_ndp)); len +=print_array_to_buf_index (buf, len,"ax_mu_mimo_brpollX_tried = " ,1 , htt_stats_buf->ax_mu_mimo_brpoll, -ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS ,"\n" ); +ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS -1 ,"\n" ); len +=scnprintf (buf + len, buf_len - len,"ax_basic_trigger = %u\n" ,le32_to_cpu (htt_stats_buf->ax_basic_trigger)); len += scnprintf(buf + len, buf_len - len, "ax_ulmumimo_total_trigger = %u\n",
Signature · 1 line
2.34.1
Quoted 23 lines · Karol Przybylski
Selfgen stats are placed in a buffer using
print_array_to_buf_index()function. Array length parameter passed to the function is too big, resulting in possible out-of bound memory error.
Decreasing buffer size by one fixes faulty upper bound of passed array.Discovered in coverity scan, CID 1600742 and CID 1600758
Signed-off-by Karol Przybylski <[email protected]>---
Changes in v3:
- Code style: added spaces before and after '-'
- Improved commit msg
- Fixed same error in different function
- Link to previous discussion: https://lore.kernel.org/all/[email protected]/--- drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c +0
-0
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c ath12k_htt_print_tx_selfgen_ac_stats_tlv(const void *tag_buf, u16 tag_len, · line 1565
Quoted 5 lines
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c +1
-1@@ -1562,7 +1562,7 @@ ath12k_htt_print_tx_selfgen_ac_stats_tlv(const void *tag_buf, u16 tag_len, le32_to_cpu(htt_stats_buf->ac_mu_mimo_ndp)); len +=print_array_to_buf_index (buf, len,"ac_mu_mimo_brpollX_tried = " ,1 , htt_stats_buf->ac_mu_mimo_brpoll, -ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS ,"\n\n" ); +ATH12K_HTT_TX_NUM_AC_MUMIMO_USER_STATS -1 ,"\n\n" );
Our ath12k-check tool reports:drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c:1565: line length of 92 exceeds 90 columns
I'll fix this in the 'pending' branch
Quoted 12 lines
drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c +1
-1stats_req->buf_len = len; }@@ -1590,7 +1590,7 @@ ath12k_htt_print_tx_selfgen_ax_stats_tlv(const void *tag_buf, u16 tag_len, le32_to_cpu(htt_stats_buf->ax_mu_mimo_ndp)); len +=print_array_to_buf_index (buf, len,"ax_mu_mimo_brpollX_tried = " ,1 , htt_stats_buf->ax_mu_mimo_brpoll, -ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS ,"\n" ); +ATH12K_HTT_TX_NUM_AX_MUMIMO_USER_STATS -1 ,"\n" ); len +=scnprintf (buf + len, buf_len - len,"ax_basic_trigger = %u\n" ,le32_to_cpu (htt_stats_buf->ax_basic_trigger)); len += scnprintf(buf + len, buf_len - len, "ax_ulmumimo_total_trigger = %u\n",
Quoted 8 lines · Karol Przybylski
Selfgen stats are placed in a buffer using
print_array_to_buf_index()function. Array length parameter passed to the function is too big, resulting in possible out-of bound memory error.
Decreasing buffer size by one fixes faulty upper bound of passed array.Discovered in coverity scan, CID 1600742 and CID 1600758
Signed-off-by Karol Przybylski <[email protected]>
I assume you only compile tested this, it's always good to mention that in the commit message. But no need resend because of this.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Jeff Johnson
AppliedQuoted 8 lines · Karol Przybylski
Selfgen stats are placed in a buffer using
print_array_to_buf_index()function. Array length parameter passed to the function is too big, resulting in possible out-of bound memory error.
Decreasing buffer size by one fixes faulty upper bound of passed array.Discovered in coverity scan, CID 1600742 and CID 1600758
[...]
Applied, thanks!
[1/1] wifi: ath12k: Fix for out-of bound access error
commit: eb8c0534713865d190856f10bfc97cf0b88475b1
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>