NFS: Fix an off by one in root_nfs_cat()

[ Upstream commit 698ad1a538da0b6bf969cfee630b4e3a026afb87 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET 2024-02-18 22:16:53 +01:00 коммит произвёл Sasha Levin
Родитель 704dc01387
Коммит 6ca2ea698d
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

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