public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Colin Ian King <[email protected]>,
	Jens Axboe <[email protected]>,
	[email protected]
Cc: [email protected], [email protected]
Subject: Re: [PATCH][next] io_uring: Fix memory leak on error return path.
Date: Thu, 29 Apr 2021 11:41:26 +0100	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

On 4/29/21 11:36 AM, Colin Ian King wrote:
> On 29/04/2021 11:32, Pavel Begunkov wrote:
>> On 4/29/21 11:26 AM, Colin King wrote:
>>> From: Colin Ian King <[email protected]>
>>>
>>> Currently the -EINVAL error return path is leaking memory allocated
>>> to data. Fix this by kfree'ing data before the return.
>>>
>>> Addresses-Coverity: ("Resource leak")
>>> Fixes: c3a40789f6ba ("io_uring: allow empty slots for reg buffers")
>>> Signed-off-by: Colin Ian King <[email protected]>
>>> ---
>>>  fs/io_uring.c | 4 +++-
>>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/fs/io_uring.c b/fs/io_uring.c
>>> index 47c2f126f885..beeb477e4f6a 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)
>>> +		if (!iov.iov_base && tag) {> +			kfree(data);
>>>  			return -EINVAL;
>>> +		}
>>
>> Buggy indeed, should have been:
>>
>> ret = -EINVAL;
>> break;
> Ah, thanks.
> 
>>
>> Colin, can you resend with the change?
> 
> Will do in a moment or so.

Hmm, there are actually two of them, look for

"iov.iov_base && tag"

>>
>>>  
>>>  		ret = io_sqe_buffer_register(ctx, &iov, &ctx->user_bufs[i],
>>>  					     &last_hpage);
>>>
>>
> 

-- 
Pavel Begunkov

      reply	other threads:[~2021-04-29 10:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-29 10:26 [PATCH][next] io_uring: Fix memory leak on error return path Colin King
2021-04-29 10:32 ` Pavel Begunkov
2021-04-29 10:36   ` Colin Ian King
2021-04-29 10:41     ` Pavel Begunkov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox