NFSD: Fix destination buffer size in nfsd4_ssc_setup_dul()
Subsystems (3)
PATCH 1/1 NFSD: Fix destination buffer size in nfsd4_ssc_setup_dul()
Commit 5304877936c0 ("NFSD: Fix strncpy() fortify warning") replaced strncpy(,, sizeof(..)) with strlcpy(,, sizeof(..) - 1), but strlcpy() already guaranteed NUL-termination of the destination buffer and subtracting one byte potentially truncated the source string.
The incorrect size was then carried over in commit 72f78ae00a8e ("NFSD:
move from strlcpy with unused retval to strscpy") when switching from strlcpy() to strscpy().
Fix this off-by-one error by using the full size of the destination buffer again.
--- fs/nfsd/nfs4proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4proc.c +1 -1
@@ -1469,7 +1469,7 @@ static __be32 nfsd4_ssc_setup_dul(struct nfsd_net *nn, char *ipaddr,return 0 ; }if (work) { -strscpy (work->nsui_ipaddr, ipaddr,sizeof (work->nsui_ipaddr) -1 ); +strscpy (work->nsui_ipaddr, ipaddr);refcount_set (&work->nsui_refcnt,2 ); work->nsui_busy = true;list_add_tail (&work->nsui_list, &nn->nfsd_ssc_mount_list);
Signature · 1 line
2.50.1
Chuck Lever
maintainerFrom: Chuck Lever <[email protected]>
Quoted 10 lines · Thorsten Blum
Commit
5304877936c0("NFSD: Fixstrncpy()fortify warning") replacedstrncpy(,, sizeof(..))withstrlcpy(,, sizeof(..) - 1), butstrlcpy()already guaranteed NUL-termination of the destination buffer and subtracting one byte potentially truncated the source string.The incorrect size was then carried over in commit
72f78ae00a8e("NFSD:
move from strlcpy with unused retval to strscpy") when switching fromstrlcpy()tostrscpy().[...]
Applied to nfsd-testing, thanks!
[1/1] NFSD: Fix destination buffer size in nfsd4_ssc_setup_dul()
commit: 5486ae619bff16a8c885afab7f40b10c69030344
--
Chuck Lever