tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs fix from Al Viro:
"Oh, well... Still nothing useful on that livelock (I had something
that looked kinda-sorta like a non-invasive solution, but it
deadlocks), so it's just Miklos' vmsplice fix for now"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
vfs: fix vmplice_to_user()

Linus Torvalds 28269580 4efdedca

+4 -2
+4 -2
fs/splice.c
··· 1537 1537 struct iovec iovstack[UIO_FASTIOV]; 1538 1538 struct iovec *iov = iovstack; 1539 1539 struct iov_iter iter; 1540 - ssize_t count = 0; 1540 + ssize_t count; 1541 1541 1542 1542 pipe = get_pipe_info(file); 1543 1543 if (!pipe) ··· 1546 1546 ret = rw_copy_check_uvector(READ, uiov, nr_segs, 1547 1547 ARRAY_SIZE(iovstack), iovstack, &iov); 1548 1548 if (ret <= 0) 1549 - return ret; 1549 + goto out; 1550 1550 1551 + count = ret; 1551 1552 iov_iter_init(&iter, iov, nr_segs, count, 0); 1552 1553 1553 1554 sd.len = 0; ··· 1561 1560 ret = __splice_from_pipe(pipe, &sd, pipe_to_user); 1562 1561 pipe_unlock(pipe); 1563 1562 1563 + out: 1564 1564 if (iov != iovstack) 1565 1565 kfree(iov); 1566 1566