diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2024-04-15 09:50:43 +0800 |
|---|---|---|
| committer | ZhaoLong Wang <wangzhaolong1@huawei.com> | 2024-04-15 10:05:19 +0800 |
| commit | 61520adc3a702bf75b811c440c9736baaaa73bcc (patch) | |
| tree | e824fccdcc4334c8c1d06546d643e76b367ddcdf | |
| parent | 5648f4b701789243bf677ea80210c093c15d469c (diff) | |
| download | openEuler-kernel-61520adc3a702bf75b811c440c9736baaaa73bcc.tar.gz | |
fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
mainline inclusion
from mainline-v6.8
commit 961ebd120565cb60cebe21cb634fbc456022db4a
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9E2O3
CVE: CVE-2024-26764
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=961ebd120565cb60cebe21cb634fbc456022db4a
--------------------------------
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: b820de741ae4 ("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>
Signed-off-by: ZhaoLong Wang <wangzhaolong1@huawei.com>
| -rw-r--r-- | fs/aio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c index 8794bfcdaf233f..00641a1ad0b3ff 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -565,8 +565,8 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events) void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel) { - struct aio_kiocb *req = container_of(iocb, struct aio_kiocb, rw); - struct kioctx *ctx = req->ki_ctx; + struct aio_kiocb *req; + struct kioctx *ctx; unsigned long flags; /* @@ -576,9 +576,13 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel) if (!(iocb->ki_flags & IOCB_AIO_RW)) return; + req = container_of(iocb, struct aio_kiocb, rw); + if (WARN_ON_ONCE(!list_empty(&req->ki_list))) return; + ctx = req->ki_ctx; + spin_lock_irqsave(&ctx->ctx_lock, flags); list_add_tail(&req->ki_list, &ctx->active_reqs); req->ki_cancel = cancel; |