Skip to content

Commit

Permalink
io_uring/msg_ring: check file type before putting
Browse files Browse the repository at this point in the history
If we're invoked with a fixed file, follow the normal rules of not
calling io_fput_file(). Fixed files are permanently registered to the
ring, and do not need putting separately.

Cc: stable@vger.kernel.org
Fixes: aa184e8 ("io_uring: don't attempt to IOPOLL for MSG_RING requests")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
axboe committed Sep 15, 2022
1 parent 62bb064 commit fc7222c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion io_uring/msg_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ int io_msg_ring(struct io_kiocb *req, unsigned int issue_flags)
req_set_fail(req);
io_req_set_res(req, ret, 0);
/* 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;
return IOU_OK;
}

0 comments on commit fc7222c

Please sign in to comment.