mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Maíra Canal" <mairacanal@riseup.net>
To: "YoungJun.park" <her0gyugyu@gmail.com>,
	Brendan Higgins <brendan.higgins@linux.dev>
Cc: David Gow <davidgow@google.com>,
	linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] kunit: alloc_string_stream_fragment error handling bug fix
Date: Sat, 29 Oct 2022 07:35:30 -0300	[thread overview]
Message-ID: <383a94bf-e9f1-49a9-9df9-1e72c51b5444@riseup.net> (raw)
In-Reply-To: <20221028144241.634012-1-her0gyugyu@gmail.com>

On 10/28/22 11:42, YoungJun.park wrote:
> When it fails to allocate fragment, it does not free and return error.
> And check the pointer inappropriately.
> 
> Signed-off-by: YoungJun.park <her0gyugyu@gmail.com>
> ---
>  lib/kunit/string-stream.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c
> index 72659a9773e3..0228fe814e96 100644
> --- a/lib/kunit/string-stream.c
> +++ b/lib/kunit/string-stream.c
> @@ -23,8 +23,10 @@ static struct string_stream_fragment *alloc_string_stream_fragment(
>  		return ERR_PTR(-ENOMEM);
>  
>  	frag->fragment = kunit_kmalloc(test, len, gfp);
> -	if (!frag->fragment)
> +	if (!frag->fragment) {
> +		kunit_kfree(test, frag);

I don't believe that kunit_kfree is necessary here, because
kunit_kmalloc is like kmalloc, but the allocation is test managed, which
means that the allocation is managed by the test case and is
automatically cleaned up after the test case concludes.

So, the original version seems correct: if the allocation fails,
alloc_string_stream_fragment will return NULL and string_stream_vadd
will check if frag_container is different than NULL.

Best Regards,
- Maíra Canal

>  		return ERR_PTR(-ENOMEM);
> +	}
>  
>  	return frag;
>  }
> @@ -56,7 +58,7 @@ int string_stream_vadd(struct string_stream *stream,
>  	frag_container = alloc_string_stream_fragment(stream->test,
>  						      len,
>  						      stream->gfp);
> -	if (!frag_container)
> +	if (IS_ERR(frag_container))
>  		return -ENOMEM;
>  
>  	len = vsnprintf(frag_container->fragment, len, fmt, args);

  reply	other threads:[~2022-10-29 10:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-28 14:42 YoungJun.park
2022-10-29 10:35 ` Maíra Canal [this message]
2022-10-30  3:20 ` David Gow
2022-10-31 20:47   ` Daniel Latypov

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 \
    --in-reply-to=383a94bf-e9f1-49a9-9df9-1e72c51b5444@riseup.net \
    --to=mairacanal@riseup.net \
    --cc=brendan.higgins@linux.dev \
    --cc=davidgow@google.com \
    --cc=her0gyugyu@gmail.com \
    --cc=kunit-dev@googlegroups.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®