Skip to content

Commit c725bfc

Browse files
jankaraAl Viro
authored andcommitted
vfs: Make sendfile(2) killable even better
Commit 296291c (mm: make sendfile(2) killable) fixed an issue where sendfile(2) was doing a lot of tiny writes into a filesystem and thus was unkillable for a long time. However sendfile(2) can be (mis)used to issue lots of writes into arbitrary file descriptor such as evenfd or similar special file descriptors which never hit the standard filesystem write path and thus are still unkillable. E.g. the following example from Dmitry burns CPU for ~16s on my test system without possibility to be killed: int r1 = eventfd(0, 0); int r2 = memfd_create("", 0); unsigned long n = 1<<30; fallocate(r2, 0, 0, n); sendfile(r1, r2, 0, n); There are actually quite a few tests for pending signals in sendfile code however we data to write is always available none of them seems to trigger. So fix the problem by adding a test for pending signal into splice_from_pipe_next() also before the loop waiting for pipe buffers to be available. This should fix all the lockup issues with sendfile of the do-ton-of-tiny-writes nature. CC: stable@vger.kernel.org Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 0ebf7f1 commit c725bfc

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

fs/splice.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,13 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
809809
*/
810810
static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
811811
{
812+
/*
813+
* Check for signal early to make process killable when there are
814+
* always buffers available
815+
*/
816+
if (signal_pending(current))
817+
return -ERESTARTSYS;
818+
812819
while (!pipe->nrbufs) {
813820
if (!pipe->writers)
814821
return 0;

0 commit comments

Comments
 (0)