Unverified Commit 220645df authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12293 nfsd: return -EINVAL when namelen is 0 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QQI6NARK6HRTP3BUDZCDGTZAOIDOIGB7/ 
 
https://gitee.com/openeuler/kernel/issues/IAYQ6P 
 
Link:https://gitee.com/openeuler/kernel/pulls/12293

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 09350f59 d84ef814

fs/nfsd/nfs4recover.c

+8 −0
Original line number Diff line number Diff line
@@ -806,6 +806,10 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg, 
			ci = &cmsg->cm_u.cm_clntinfo;

			if (get_user(namelen, &ci->cc_name.cn_len))

				return -EFAULT;

			if (!namelen) {

				dprintk("%s: namelen should not be zero", __func__);

				return -EINVAL;

			}

			name.data = memdup_user(&ci->cc_name.cn_id, namelen);

			if (IS_ERR(name.data))

				return PTR_ERR(name.data);
@@ -828,6 +832,10 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg, 
			cnm = &cmsg->cm_u.cm_name;

			if (get_user(namelen, &cnm->cn_len))

				return -EFAULT;

			if (!namelen) {

				dprintk("%s: namelen should not be zero", __func__);

				return -EINVAL;

			}

			name.data = memdup_user(&cnm->cn_id, namelen);

			if (IS_ERR(name.data))

				return PTR_ERR(name.data);