wl1251: Replace strncpy with strscpy in wl1251_acx_fw_version
PATCH 1/1 wl1251: Replace strncpy with strscpy in wl1251_acx_fw_version
strncpy() is deprecated [1] for NUL-terminated destination buffers since it does not guarantee NUL termination. Remove the manual NUL termination and replace strncpy() with strscpy() to ensure NUL termination of the destination buffer.
Using strscpy_pad() to retain the NUL-padding behavior of strncpy() is not needed because ->fw_ver is only used as a C-string.
Link https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1]
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/net/wireless/ti/wl1251/acx.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/net/wireless/ti/wl1251/acx.c +2 -9
@@ -3,6 +3,7 @@#include <linux/module.h> #include <linux/slab.h> +#include <linux/string.h> #include "wl1251.h" #include "reg.h"
@@ -149,15 +150,7 @@ int wl1251_acx_fw_version(struct wl1251 *wl, char *buf, size_t len) goto out; } -/* be careful with the buffer sizes */ -strncpy (buf, rev->fw_version,min (len,sizeof (rev->fw_version))); - -/* -* if the firmware version string is exactly -* sizeof(rev->fw_version) long or fw_len is less than -* sizeof(rev->fw_version) it won't be null terminated -*/ - buf[min (len,sizeof (rev->fw_version)) -1 ] ='\0' ; +strscpy (buf, rev->fw_version, len); out:kfree (rev);
Signature · 2 lines
Thorsten Blum <[email protected]> GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4