iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vmsplice_to_user(): switch to import_iovec()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-03-21 19:17:55 -04:00
parent d4fb392f4c
commit 345995fa48
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/splice.c
View File

@ -1533,34 +1533,29 @@ static long vmsplice_to_user(struct file *file, const struct iovec __user *uiov,
struct iovec iovstack[UIO_FASTIOV]; struct iovec iovstack[UIO_FASTIOV];
struct iovec *iov = iovstack; struct iovec *iov = iovstack;
struct iov_iter iter; struct iov_iter iter;
ssize_t count;
pipe = get_pipe_info(file); pipe = get_pipe_info(file);
if (!pipe) if (!pipe)
return -EBADF; return -EBADF;
ret = rw_copy_check_uvector(READ, uiov, nr_segs, ret = import_iovec(READ, uiov, nr_segs,
ARRAY_SIZE(iovstack), iovstack, &iov); ARRAY_SIZE(iovstack), &iov, &iter);
if (ret <= 0) if (ret < 0)
goto out; return ret;
count = ret;
iov_iter_init(&iter, READ, iov, nr_segs, count);
sd.total_len = iov_iter_count(&iter);
sd.len = 0; sd.len = 0;
sd.total_len = count;
sd.flags = flags; sd.flags = flags;
sd.u.data = &iter; sd.u.data = &iter;
sd.pos = 0; sd.pos = 0;
pipe_lock(pipe); if (sd.total_len) {
ret = __splice_from_pipe(pipe, &sd, pipe_to_user); pipe_lock(pipe);
pipe_unlock(pipe); ret = __splice_from_pipe(pipe, &sd, pipe_to_user);
pipe_unlock(pipe);
out: }
if (iov != iovstack)
kfree(iov);
kfree(iov);
return ret; return ret;
} }