iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'io_uring-6.0-2022-09-16' of git://git.kernel.dk/linux-block

Browse Source 
Pull io_uring fixes from Jens Axboe:
 "Two small patches:

   - Fix using an unsigned type for the return value, introduced in this
     release (Pavel)

   - Stable fix for a missing check for a fixed file on put (me)"

* tag 'io_uring-6.0-2022-09-16' of git://git.kernel.dk/linux-block:
  io_uring/msg_ring: check file type before putting
  io_uring/rw: fix error'ed retry return values
This commit is contained in:
Linus Torvalds
2022-09-16 06:50:25 -07:00
parent 5763d7f296 fc7222c3a9
commit 0158137d81
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
io_uring/msg_ring.c
View File

@ -165,7 +165,8 @@ done:
req_set_fail(req); req_set_fail(req);
io_req_set_res(req, ret, 0); io_req_set_res(req, ret, 0);
/* put file to avoid an attempt to IOPOLL the req */ /* put file to avoid an attempt to IOPOLL the req */
io_put_file(req->file); if (!(req->flags & REQ_F_FIXED_FILE))
io_put_file(req->file);
req->file = NULL; req->file = NULL;
return IOU_OK; return IOU_OK;
} }

2
io_uring/rw.c
View File

@ -206,7 +206,7 @@ static bool __io_complete_rw_common(struct io_kiocb *req, long res)
return false; return false;
} }
static inline unsigned io_fixup_rw_res(struct io_kiocb *req, unsigned res) static inline int io_fixup_rw_res(struct io_kiocb *req, long res)
{ {
struct io_async_rw *io = req->async_data; struct io_async_rw *io = req->async_data;