kevin/linux
1
Fork 0
Code

NFS: Fix an off by one in root_nfs_cat()

Browse Source 
The intent is to check if 'dest' is truncated or not. So, >= should be
used instead of >, because strlcat() returns the length of 'dest' and 'src'
excluding the trailing NULL.

Fixes: 56463e50d1 ("NFS: Use super.c for NFSROOT mount option parsing")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Christophe JAILLET 2024-02-18 22:16:53 +01:00 committed by Trond Myklebust
parent 1548036ef1
commit 698ad1a538
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/nfsroot.c
View File

@ -175,10 +175,10 @@ static int __init root_nfs_cat(char *dest, const char *src,
size_t len = strlen(dest);
if (len && dest[len - 1] != ',')
if (strlcat(dest, ",", destlen) > destlen)
if (strlcat(dest, ",", destlen) >= destlen)
return -1;
if (strlcat(dest, src, destlen) > destlen)
if (strlcat(dest, src, destlen) >= destlen)
return -1;
return 0;
}