Unverified Commit 379c2b2c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9390 NFS: Fix an off by one in root_nfs_cat() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Zhaolong <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IHFUF2KBZAJSYK5DK7HHY6KA2VMYX7RY/ 
 
https://gitee.com/openeuler/kernel/issues/IA7XXI 
 
Link:https://gitee.com/openeuler/kernel/pulls/9390

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 5b9f9daa 374a8fcb

fs/nfs/nfsroot.c

+2 −2
Original line number Diff line number Diff line
@@ -169,10 +169,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;

}