io_uring: Fix premature return from loop and memory leak
Subsystems (3)
PATCH v2 1/1 io_uring: Fix premature return from loop and memory leak
From: Colin Ian King <[email protected]>
Currently the -EINVAL error return path is leaking memory allocated to data. Fix this by not returning immediately but instead setting the error return variable to -EINVAL and breaking out of the loop.
Kudos to Pavel Begunkov for suggesting a correct fix.
---
V2: set ret/err to -EINVAL and break rather than kfree and return,
fix both occurrences of this issue.
--- fs/io_uring.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/io_uring.c +8 -4
@@ -8417,8 +8417,10 @@ static int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg, ret =io_buffer_validate (&iov);if (ret)break ; -if (!iov.iov_base && tag) -return -EINVAL ; +if (!iov.iov_base && tag) { + ret = -EINVAL ; +break ; + } ret =io_sqe_buffer_register (ctx, &iov, &ctx->user_bufs[i], &last_hpage);
@@ -8468,8 +8470,10 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, err =io_buffer_validate (&iov);if (err)break ; -if (!iov.iov_base && tag) -return -EINVAL ; +if (!iov.iov_base && tag) { + err = -EINVAL ; +break ; + } err =io_sqe_buffer_register (ctx, &iov, &imu, &last_hpage);if (err)break ;
Signature · 1 line
2.30.2
Quoted 7 lines · Colin King
From: Colin Ian King <[email protected]>
Currently the
-EINVALerror return path is leaking memory allocated to data. Fix this by not returning immediately but instead setting the error return variable to-EINVALand breaking out of the loop.Kudos to Pavel Begunkov for suggesting a correct fix.
Looks good, thanks
Quoted 42 lines
Signed-off-by Colin Ian King <[email protected]>---
V2: set ret/err to
-EINVALand break rather than kfree and return,
fix both occurrences of this issue.--- fs/io_uring.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)fs/io_uring.c +8
-4@@ -8417,8 +8417,10 @@ static int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg, ret =io_buffer_validate (&iov);if (ret)break ; -if (!iov.iov_base && tag) -return -EINVAL ; +if (!iov.iov_base && tag) { + ret = -EINVAL ; +break ; + } ret =io_sqe_buffer_register (ctx, &iov, &ctx->user_bufs[i], &last_hpage);@@ -8468,8 +8470,10 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, err =io_buffer_validate (&iov);if (err)break ; -if (!iov.iov_base && tag) -return -EINVAL ; +if (!iov.iov_base && tag) { + err = -EINVAL ; +break ; + } err =io_sqe_buffer_register (ctx, &iov, &imu, &last_hpage);if (err)break ;
Signature · 1 line
Pavel Begunkov
Quoted 7 lines · Colin King
From: Colin Ian King <[email protected]>
Currently the
-EINVALerror return path is leaking memory allocated to data. Fix this by not returning immediately but instead setting the error return variable to-EINVALand breaking out of the loop.Kudos to Pavel Begunkov for suggesting a correct fix.
Applied, thanks.
Signature · 1 line
Jens Axboe