Commit 66701750 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.16-20250630' of git://git.kernel.dk/linux 

Pull io_uring fix from Jens Axboe:
 "Now that anonymous inodes set S_IFREG, this breaks the io_uring
  read/write retries for short reads/writes. As things like timerfd and
  eventfd are anon inodes, applications that previously did:

    unsigned long event_data[2];

    io_uring_prep_read(sqe, evfd, event_data, sizeof(event_data), 0);

  and just got a short read when 1 event was posted, will now wait for
  the full amount before posting a completion.

  This caused issues for the ghostty application, making it basically
  unusable due to excessive buffering"

* tag 'io_uring-6.16-20250630' of git://git.kernel.dk/linux:
  io_uring: gate REQ_F_ISREG on !S_ANON_INODE as well
parents 4b424a3f 6f11adcc

io_uring/io_uring.c

+2 −1
Original line number Diff line number Diff line
@@ -1666,11 +1666,12 @@ static void io_iopoll_req_issued(struct io_kiocb *req, unsigned int issue_flags) 


io_req_flags_t io_file_get_flags(struct file *file)

{

	struct inode *inode = file_inode(file);

	io_req_flags_t res = 0;



	BUILD_BUG_ON(REQ_F_ISREG_BIT != REQ_F_SUPPORT_NOWAIT_BIT + 1);



	if (S_ISREG(file_inode(file)->i_mode))

	if (S_ISREG(inode->i_mode) && !(inode->i_flags & S_ANON_INODE))

		res |= REQ_F_ISREG;

	if ((file->f_flags & O_NONBLOCK) || (file->f_mode & FMODE_NOWAIT))

		res |= REQ_F_SUPPORT_NOWAIT;