diff options
| author | Caleb Sander Mateos <csander@purestorage.com> | 2025-02-12 13:45:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-21 14:11:17 +0100 |
| commit | fdb4473b3949985c5fb1dc5eb33953a959d1dbd3 (patch) | |
| tree | c8ef1b241792d1e27f375746a1ec1200e256eef9 /io_uring | |
| parent | 8f30a73f361489aa1ec84275f4e9337ce4fee592 (diff) | |
| download | linux-fdb4473b3949985c5fb1dc5eb33953a959d1dbd3.tar.gz linux-fdb4473b3949985c5fb1dc5eb33953a959d1dbd3.tar.bz2 linux-fdb4473b3949985c5fb1dc5eb33953a959d1dbd3.zip | |
io_uring/uring_cmd: don't assume io_uring_cmd_data layout
[ Upstream commit 34cae91215c6f65bed2a124fb9283da6ec0b8dd9 ]
eaf72f7b414f ("io_uring/uring_cmd: cleanup struct io_uring_cmd_data
layout") removed most of the places assuming struct io_uring_cmd_data
has sqes as its first field. However, the EAGAIN case in io_uring_cmd()
still compares ioucmd->sqe to the struct io_uring_cmd_data pointer using
a void * cast. Since fa3595523d72 ("io_uring: get rid of alloc cache
init_once handling"), sqes is no longer io_uring_cmd_data's first field.
As a result, the pointers will always compare unequal and memcpy() may
be called with the same source and destination.
Replace the incorrect void * cast with the address of the sqes field.
Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Fixes: eaf72f7b414f ("io_uring/uring_cmd: cleanup struct io_uring_cmd_data layout")
Link: https://lore.kernel.org/r/20250212204546.3751645-2-csander@purestorage.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: e663da62ba86 ("io_uring/uring_cmd: switch sqe to async_data on EAGAIN")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/uring_cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index caed143fb156..b72154fefbee 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -268,7 +268,7 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags) if (ret == -EAGAIN) { struct io_uring_cmd_data *cache = req->async_data; - if (ioucmd->sqe != (void *) cache) + if (ioucmd->sqe != cache->sqes) memcpy(cache->sqes, ioucmd->sqe, uring_sqe_size(req->ctx)); return -EAGAIN; } else if (ret == -EIOCBQUEUED) { |