* [PATCH][next] io_uring: Fix memory leak on error return path.
@ 2021-04-29 10:26 Colin King
2021-04-29 10:32 ` Pavel Begunkov
0 siblings, 1 reply; 4+ messages in thread
From: Colin King @ 2021-04-29 10:26 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 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 <colin.king@canonical.com>
---
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;
+ }
ret = io_sqe_buffer_register(ctx, &iov, &ctx->user_bufs[i],
&last_hpage);
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH][next] io_uring: Fix memory leak on error return path.
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
0 siblings, 1 reply; 4+ messages in thread
From: Pavel Begunkov @ 2021-04-29 10:32 UTC (permalink / raw)
To: Colin King, Jens Axboe, io-uring; +Cc: kernel-janitors, linux-kernel
On 4/29/21 11:26 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 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 <colin.king@canonical.com>
> ---
> 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;
Colin, can you resend with the change?
>
> ret = io_sqe_buffer_register(ctx, &iov, &ctx->user_bufs[i],
> &last_hpage);
>
--
Pavel Begunkov
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH][next] io_uring: Fix memory leak on error return path.
2021-04-29 10:32 ` Pavel Begunkov
@ 2021-04-29 10:36 ` Colin Ian King
2021-04-29 10:41 ` Pavel Begunkov
0 siblings, 1 reply; 4+ messages in thread
From: Colin Ian King @ 2021-04-29 10:36 UTC (permalink / raw)
To: Pavel Begunkov, Jens Axboe, io-uring; +Cc: kernel-janitors, linux-kernel
On 29/04/2021 11:32, Pavel Begunkov wrote:
> On 4/29/21 11:26 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 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 <colin.king@canonical.com>
>> ---
>> 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.
>
>>
>> ret = io_sqe_buffer_register(ctx, &iov, &ctx->user_bufs[i],
>> &last_hpage);
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH][next] io_uring: Fix memory leak on error return path.
2021-04-29 10:36 ` Colin Ian King
@ 2021-04-29 10:41 ` Pavel Begunkov
0 siblings, 0 replies; 4+ messages in thread
From: Pavel Begunkov @ 2021-04-29 10:41 UTC (permalink / raw)
To: Colin Ian King, Jens Axboe, io-uring; +Cc: kernel-janitors, linux-kernel
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 <colin.king@canonical.com>
>>>
>>> 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 <colin.king@canonical.com>
>>> ---
>>> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-29 10:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).