| Message ID | 20231010062250.2580951-1-kvalo@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a47111663491ff2829df0626493ce81b48dd880a |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath11k: ath11k_debugfs_register(): fix format-truncation warning | expand |
On 10/9/2023 11:22 PM, Kalle Valo wrote: > From: Kalle Valo <quic_kvalo@quicinc.com> > > In v6.6-rc4 with GCC 13.2 I see a new warning: > > drivers/net/wireless/ath/ath11k/debugfs.c: In function 'ath11k_debugfs_register': > drivers/net/wireless/ath/ath11k/debugfs.c:1597:51: error: '%d' directive output may be truncated writing between 1 and 3 bytes into a region of size 2 [-Werror=format-truncation=] > drivers/net/wireless/ath/ath11k/debugfs.c:1597:48: note: directive argument in the range [0, 255] > drivers/net/wireless/ath/ath11k/debugfs.c:1597:9: note: 'snprintf' output between 5 and 7 bytes into a destination of size 5 > > Increase the size of pdev_name to 10 bytes to make sure there's enough room for > the string. Also change the format to '%u' as ar->pdev_idx is u8. > > Compile tested only. > > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Kalle Valo <kvalo@kernel.org> wrote: > In v6.6-rc4 with GCC 13.2 I see a new warning: > > drivers/net/wireless/ath/ath11k/debugfs.c: In function 'ath11k_debugfs_register': > drivers/net/wireless/ath/ath11k/debugfs.c:1597:51: error: '%d' directive output may be truncated writing between 1 and 3 bytes into a region of size 2 [-Werror=format-truncation=] > drivers/net/wireless/ath/ath11k/debugfs.c:1597:48: note: directive argument in the range [0, 255] > drivers/net/wireless/ath/ath11k/debugfs.c:1597:9: note: 'snprintf' output between 5 and 7 bytes into a destination of size 5 > > Increase the size of pdev_name to 10 bytes to make sure there's enough room for > the string. Also change the format to '%u' as ar->pdev_idx is u8. > > Compile tested only. > > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. a47111663491 wifi: ath11k: ath11k_debugfs_register(): fix format-truncation warning
diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c index 5bb6fd17fdf6..6f89e24cb612 100644 --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c @@ -1591,10 +1591,10 @@ static const struct file_operations fops_ps_state_enable = { int ath11k_debugfs_register(struct ath11k *ar) { struct ath11k_base *ab = ar->ab; - char pdev_name[5]; + char pdev_name[10]; char buf[100] = {0}; - snprintf(pdev_name, sizeof(pdev_name), "%s%d", "mac", ar->pdev_idx); + snprintf(pdev_name, sizeof(pdev_name), "%s%u", "mac", ar->pdev_idx); ar->debug.debugfs_pdev = debugfs_create_dir(pdev_name, ab->debugfs_soc); if (IS_ERR(ar->debug.debugfs_pdev))