From: Jan Kara <[email protected]>

ioctx_alloc() saves the 32-bit nr_events in max_reqs, then doubles
nr_events before checking the ring-size bound.  For
nr_events=0x80000001, the doubled value wraps to 2, so the ring check
passes and aio_setup_ring() builds a one-page/127-slot ring.  The
original 0x80000001 is still stored in ctx->max_reqs and charged to the
global aio_nr quota.

If an administrator has raised fs.aio-max-nr to at least 0x80000001,
an unprivileged process can create that context and make later normal
io_setup() calls fail with -EAGAIN until the wrapped context is
destroyed.

Check for too large number of requests before multiplying.

Link: https://lore.kernel.org/all/[email protected]
Reported-by: Cheng Yongkang <[email protected]>
Signed-off-by: Jan Kara <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Christian Brauner (Amutable) <[email protected]>
(cherry picked from commit b44341e39d856e4cc6ad8ed94ebffd440f39846c)

https://virtuozzo.atlassian.net/browse/VSTOR-155110

Feature: fix ms/aio
Signed-off-by: Pavel Tikhomirov <[email protected]>
---
 fs/aio.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/aio.c b/fs/aio.c
index 2ff1758507611..173b35ebed991 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -773,13 +773,12 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
                nr_events = max(nr_events, num_possible_cpus() * 4);
        else if (nr_events < num_possible_cpus() * 4)
                no_percpu_reqs = true;
-       nr_events *= 2;
-
        /* Prevent overflows */
-       if (nr_events > (0x10000000U / sizeof(struct io_event))) {
+       if (nr_events > (0x8000000U / sizeof(struct io_event))) {
                pr_debug("ENOMEM: nr_events too high\n");
                return ERR_PTR(-EINVAL);
        }
+       nr_events *= 2;
 
        if (!nr_events || (unsigned long)max_reqs > ve->aio_max_nr)
                return ERR_PTR(-EAGAIN);

---
base-commit: a656d0a24ddd1939d7deea2f7450873e662c828e
change-id: 20261117-pr-ptikhomirov-vstor-155110-aio-nr-overflow-ac6d336ee111

Best regards,
--  
Pavel Tikhomirov <[email protected]>

_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to