lkml.org 
[lkml]   [2021]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH][next][V2] io_uring: Fix premature return from loop and memory leak
From
Date
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

\
 
 \ /
  Last update: 2021-04-29 13:46    [W:0.063 / U:1.496 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site