Skip to content

Commit 961ebd1

Browse files
bvanasschebrauner
authored andcommitted
fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
The first kiocb_set_cancel_fn() argument may point at a struct kiocb that is not embedded inside struct aio_kiocb. With the current code, depending on the compiler, the req->ki_ctx read happens either before the IOCB_AIO_RW test or after that test. Move the req->ki_ctx read such that it is guaranteed that the IOCB_AIO_RW test happens first. Reported-by: Eric Biggers <ebiggers@kernel.org> Cc: Benjamin LaHaise <ben@communityfibre.ca> Cc: Eric Biggers <ebiggers@google.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Avi Kivity <avi@scylladb.com> Cc: Sandeep Dhavale <dhavale@google.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Kent Overstreet <kent.overstreet@linux.dev> Cc: stable@vger.kernel.org Fixes: b820de7 ("fs/aio: Restrict kiocb_set_cancel_fn() to I/O submitted via libaio") Signed-off-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/20240304235715.3790858-1-bvanassche@acm.org Reviewed-by: Jens Axboe <axboe@kernel.dk> Reviewed-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 28468cb commit 961ebd1

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

fs/aio.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,8 +589,8 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)
589589

590590
void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)
591591
{
592-
struct aio_kiocb *req = container_of(iocb, struct aio_kiocb, rw);
593-
struct kioctx *ctx = req->ki_ctx;
592+
struct aio_kiocb *req;
593+
struct kioctx *ctx;
594594
unsigned long flags;
595595

596596
/*
@@ -600,9 +600,13 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)
600600
if (!(iocb->ki_flags & IOCB_AIO_RW))
601601
return;
602602

603+
req = container_of(iocb, struct aio_kiocb, rw);
604+
603605
if (WARN_ON_ONCE(!list_empty(&req->ki_list)))
604606
return;
605607

608+
ctx = req->ki_ctx;
609+
606610
spin_lock_irqsave(&ctx->ctx_lock, flags);
607611
list_add_tail(&req->ki_list, &ctx->active_reqs);
608612
req->ki_cancel = cancel;

0 commit comments

Comments
 (0)