Skip to content

Commit 2c6b531

Browse files
dhowellsbrauner
authored andcommitted
netfs: Fix AIO error handling when doing write-through
If an error occurs whilst we're doing an AIO write in write-through mode, we may end up calling ->ki_complete() *and* returning an error from ->write_iter(). This can result in either a UAF (the ->ki_complete() func pointer may get overwritten, for example) or a refcount underflow in io_submit() as ->ki_complete is called twice. Fix this by making netfs_end_writethrough() - and thus netfs_perform_write() - unconditionally return -EIOCBQUEUED if we're doing an AIO write and wait for completion if we're not. Fixes: 288ace2 ("netfs: New writeback implementation") Signed-off-by: David Howells <dhowells@redhat.com> Link: https://lore.kernel.org/r/295052.1716298587@warthog.procyon.org.uk cc: Jeff Layton <jlayton@kernel.org> cc: Enzo Matsumiya <ematsumiya@suse.de> cc: netfs@lists.linux.dev cc: v9fs@lists.linux.dev cc: linux-afs@lists.infradead.org cc: linux-cifs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 9b038d0 commit 2c6b531

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

fs/netfs/write_issue.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,12 @@ int netfs_end_writethrough(struct netfs_io_request *wreq, struct writeback_contr
636636

637637
mutex_unlock(&ictx->wb_lock);
638638

639-
ret = wreq->error;
639+
if (wreq->iocb) {
640+
ret = -EIOCBQUEUED;
641+
} else {
642+
wait_on_bit(&wreq->flags, NETFS_RREQ_IN_PROGRESS, TASK_UNINTERRUPTIBLE);
643+
ret = wreq->error;
644+
}
640645
netfs_put_request(wreq, false, netfs_rreq_trace_put_return);
641646
return ret;
642647
}

0 commit comments

Comments
 (0)