a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS: Fix use of copy_to_user() in idmap_pipe_upcall

Browse Source 
The idmap_pipe_upcall() function expects the copy_to_user() function to
return a negative error value if the call fails, but copy_to_user()
returns an unsigned long number of bytes that couldn't be copied.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2007-12-20 14:54:42 -05:00 committed by Trond Myklebust
parent 369af0f116
commit a661b77fc1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfs/idmap.c
View File

@ -358,17 +358,15 @@ idmap_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg,
char __user *dst, size_t buflen) char __user *dst, size_t buflen)
{ {
char *data = (char *)msg->data + msg->copied; char *data = (char *)msg->data + msg->copied;
ssize_t mlen = msg->len - msg->copied; size_t mlen = min(msg->len, buflen);
ssize_t left; unsigned long left;
if (mlen > buflen)
mlen = buflen;
left = copy_to_user(dst, data, mlen); left = copy_to_user(dst, data, mlen);
if (left < 0) { if (left == mlen) {
msg->errno = left; msg->errno = -EFAULT;
return left; return -EFAULT;
} }
mlen -= left; mlen -= left;
msg->copied += mlen; msg->copied += mlen;
msg->errno = 0; msg->errno = 0;