* [PATCH][next][V2] io_uring: Fix premature return from loop and memory leak
@ 2021-04-29 10:46 Colin King
2021-04-29 11:45 ` Pavel Begunkov
2021-04-29 14:27 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2021-04-29 10:46 UTC (permalink / raw)
To: Jens Axboe, Pavel Begunkov, io-uring; +Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
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(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 47c2f126f885..c783ad83f220 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -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;
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next][V2] io_uring: Fix premature return from loop and memory leak
2021-04-29 10:46 [PATCH][next][V2] io_uring: Fix premature return from loop and memory leak Colin King
@ 2021-04-29 11:45 ` Pavel Begunkov
2021-04-29 14:27 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Pavel Begunkov @ 2021-04-29 11:45 UTC (permalink / raw)
To: Colin King, Jens Axboe, io-uring; +Cc: kernel-janitors, linux-kernel
On 4/29/21 11:46 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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.
Looks good, thanks
Reviewed-by: Pavel Begunkov <asml.silence@gmail.com>
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>
> 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(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 47c2f126f885..c783ad83f220 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -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;
>
--
Pavel Begunkov
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next][V2] io_uring: Fix premature return from loop and memory leak
2021-04-29 10:46 [PATCH][next][V2] io_uring: Fix premature return from loop and memory leak Colin King
2021-04-29 11:45 ` Pavel Begunkov
@ 2021-04-29 14:27 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2021-04-29 14:27 UTC (permalink / raw)
To: Colin King, Pavel Begunkov, io-uring; +Cc: kernel-janitors, linux-kernel
On 4/29/21 4:46 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-29 14:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-29 10:46 [PATCH][next][V2] io_uring: Fix premature return from loop and memory leak Colin King
2021-04-29 11:45 ` Pavel Begunkov
2021-04-29 14:27 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.