staging: wlan-ng: replace strncpy() with strscpy()
PATCH 1/1 staging: wlan-ng: replace strncpy() with strscpy()
Checkpatch suggests the use of strscpy() instead of strncpy(). The advantages are that it always adds a NUL terminator and it prevents a read overflow if the src string is not properly terminated. One potential disadvantage is that it doesn't zero pad the string like strncpy() does.
In this code, strscpy() and strncpy() are equivalent and it does not affect runtime behavior. The string is zeroed on the line before using memset(). The resulting string was always NUL terminated and PRISM2_USB_FWFILE is string literal "prism2_ru.fw" so it's NUL terminated.
However, even though using strscpy() does not fix any bugs, it's still nicer and makes checkpatch happy.
---
Previous Patch Versions:
- Earlier patch versions had issues with whitespace, preventing correct application. This is a reroll of those previous versions.
- Versions v2 through v6 focused on improving the clarity of the commit message. There were no code changes in these patch versions.
drivers/staging/wlan-ng/prism2fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/wlan-ng/prism2fw.c +1 -1
@@ -725,7 +725,7 @@ static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks,if (j ==-1 ) {/* plug the filename */ memset (dest,0 , s3plug[i].len); -strncpy (dest,PRISM2_USB_FWFILE , s3plug[i].len -1 ); +strscpy (dest,PRISM2_USB_FWFILE , s3plug[i].len); }else {/* plug a PDR */ memcpy (dest, &pda->rec[j]->data, s3plug[i].len); }
Signature · 1 line
2.34.1
Quoted 13 lines · Calvince Otieno
Checkpatch suggests the use of
strscpy()instead ofstrncpy(). The advantages are that it always adds a NUL terminator and it prevents a read overflow if the src string is not properly terminated. One potential disadvantage is that it doesn't zero pad the string likestrncpy()does.
In this code,strscpy()andstrncpy()are equivalent and it does not affect runtime behavior. The string is zeroed on the line before usingmemset(). The resulting string was always NUL terminated andPRISM2_USB_FWFILEis string literal "prism2_ru.fw" so it's NUL terminated.
However, even though usingstrscpy()does not fix any bugs, it's still nicer and makes checkpatch happy.
Quoted 8 lines
Signed-off-by Calvince Otieno <[email protected]>---
Previous Patch Versions:
- Earlier patch versions had issues with whitespace, preventing correct application. This is a reroll of those previous versions.- Versions v2 through v6 focused on improving the clarity of the commit message. There were no code changes in these patch versions.
You forgot to put v6 in the subject... But it looks okay now.
regards,
dan carpenter