Skip to content

Commit 7b9762a

Browse files
committed
io_uring: zero iocb->ki_pos for stream file types
io_uring supports using offset == -1 for using the current file position, and we read that in as part of read/write command setup. For the non-iter read/write types we pass in NULL for the position pointer, but for the iter types we should not be passing any anything but 0 for the position for a stream. Clear kiocb->ki_pos if the file is a stream, don't leave it as -1. If we do, then the request will error with -ESPIPE. Fixes: ba04291 ("io_uring: allow use of offset == -1 to mean file position") Link: axboe/liburing#501 Reported-by: Samuel Williams <samuel.williams@oriontransfer.co.nz> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent d800c65 commit 7b9762a

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

fs/io_uring.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2891,9 +2891,13 @@ static int io_prep_rw(struct io_kiocb *req, const struct io_uring_sqe *sqe)
28912891
req->flags |= io_file_get_flags(file) << REQ_F_SUPPORT_NOWAIT_BIT;
28922892

28932893
kiocb->ki_pos = READ_ONCE(sqe->off);
2894-
if (kiocb->ki_pos == -1 && !(file->f_mode & FMODE_STREAM)) {
2895-
req->flags |= REQ_F_CUR_POS;
2896-
kiocb->ki_pos = file->f_pos;
2894+
if (kiocb->ki_pos == -1) {
2895+
if (!(file->f_mode & FMODE_STREAM)) {
2896+
req->flags |= REQ_F_CUR_POS;
2897+
kiocb->ki_pos = file->f_pos;
2898+
} else {
2899+
kiocb->ki_pos = 0;
2900+
}
28972901
}
28982902
kiocb->ki_flags = iocb_flags(file);
28992903
ret = kiocb_set_rw_flags(kiocb, READ_ONCE(sqe->rw_flags));

0 commit comments

Comments
 (0)