On Tue, May 17, 2022 at 12:54 AM Daniel Latypov <dlatypov@xxxxxxxxxx> wrote:
>
> kmemdup() is easier than kmalloc() + memcpy(), per lkp bot.
>
> Also make the input `suite` as const since we're now always making
> copies after commit a127b154a8f2 ("kunit: tool: allow filtering test
> cases via glob").
>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Signed-off-by: Daniel Latypov <dlatypov@xxxxxxxxxx>
> ---
Ah, this is definitely better. Thanks. I ran it under KASAN to double
check, and no issues there, either.
Reviewed-by: David Gow <davidgow@xxxxxxxxxx>
Cheers,
-- David
> lib/kunit/executor.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c
> index 2f73a6a35a7e..43e15112460a 100644
> --- a/lib/kunit/executor.c
> +++ b/lib/kunit/executor.c
> @@ -55,7 +55,7 @@ static void kunit_parse_filter_glob(struct kunit_test_filter *parsed,
>
> /* Create a copy of suite with only tests that match test_glob. */
> static struct kunit_suite *
> -kunit_filter_tests(struct kunit_suite *const suite, const char *test_glob)
> +kunit_filter_tests(const struct kunit_suite *const suite, const char *test_glob)
> {
> int n = 0;
> struct kunit_case *filtered, *test_case;
> @@ -69,11 +69,9 @@ kunit_filter_tests(struct kunit_suite *const suite, const char *test_glob)
> if (n == 0)
> return NULL;
>
> - /* Use memcpy to workaround copy->name being const. */
> - copy = kmalloc(sizeof(*copy), GFP_KERNEL);
> + copy = kmemdup(suite, sizeof(*copy), GFP_KERNEL);
> if (!copy)
> return ERR_PTR(-ENOMEM);
> - memcpy(copy, suite, sizeof(*copy));
>
> filtered = kcalloc(n + 1, sizeof(*filtered), GFP_KERNEL);
> if (!filtered)
>
> base-commit: 9660209d9418f2295d31fea0d32e313e9b2c1200
> --
> 2.36.0.550.gb090851708-goog
>
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature
