Commit f3e41ec5 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

NFSD: Use simple_read_from_buffer for coping data to userspace 



Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent ecca063b

fs/nfsd/fault_inject.c

+2 −13
Original line number Original line Diff line number Diff line
@@ -97,25 +97,14 @@ static ssize_t fault_inject_read(struct file *file, char __user *buf, 
{

{

	static u64 val;

	static u64 val;

	char read_buf[25];

	char read_buf[25];

	size_t size, ret;

	size_t size;

	loff_t pos = *ppos;

	loff_t pos = *ppos;





	if (!pos)

	if (!pos)

		nfsd_inject_get(file_inode(file)->i_private, &val);

		nfsd_inject_get(file_inode(file)->i_private, &val);

	size = scnprintf(read_buf, sizeof(read_buf), "%llu\n", val);

	size = scnprintf(read_buf, sizeof(read_buf), "%llu\n", val);





	if (pos < 0)

	return simple_read_from_buffer(buf, len, ppos, read_buf, size);

		return -EINVAL;

	if (pos >= size || !len)

		return 0;

	if (len > size - pos)

		len = size - pos;

	ret = copy_to_user(buf, read_buf + pos, len);

	if (ret == len)

		return -EFAULT;

	len -= ret;

	*ppos = pos + len;

	return len;

}

}





static ssize_t fault_inject_write(struct file *file, const char __user *buf,

static ssize_t fault_inject_write(struct file *file, const char __user *buf,