linux-kernel - Re: [PATCH] kunit: test: Use an action wrapper instead of a cast

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CA+GJov4H8DJgeaxus5BTS=Y0iR9M+BirLVht8fB9jxjWGODrMA@mail.gmail.com>
Date:   Fri, 8 Dec 2023 14:32:49 -0500
From:   Rae Moar <rmoar@...gle.com>
To:     David Gow <davidgow@...gle.com>
Cc:     Shuah Khan <skhan@...uxfoundation.org>, kunit-dev@...glegroups.com,
        Brendan Higgins <brendan.higgins@...ux.dev>,
        linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] kunit: test: Use an action wrapper instead of a cast

On Wed, Dec 6, 2023 at 3:23 AM David Gow <davidgow@...gle.com> wrote:
>
> We missed one of the casts of kfree() to kunit_action_t in kunit-test,
> which was only enabled when debugfs was in use. This could potentially
> break CFI.
>
> Use the existing wrapper function instead.
>
> Signed-off-by: David Gow <davidgow@...gle.com>

Hello!

This looks good to me. All ready to go.

Reviewed-by: Rae Moar <rmoar@...gle.com>

Thanks!
-Rae

> ---
>  lib/kunit/kunit-test.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c
> index 3e9c5192d095..ee6927c60979 100644
> --- a/lib/kunit/kunit-test.c
> +++ b/lib/kunit/kunit-test.c
> @@ -559,7 +559,7 @@ static void kunit_log_test(struct kunit *test)
>         KUNIT_EXPECT_TRUE(test, test->log->append_newlines);
>
>         full_log = string_stream_get_string(test->log);
> -       kunit_add_action(test, (kunit_action_t *)kfree, full_log);
> +       kunit_add_action(test, kfree_wrapper, full_log);
>         KUNIT_EXPECT_NOT_ERR_OR_NULL(test,
>                                      strstr(full_log, "put this in log."));
>         KUNIT_EXPECT_NOT_ERR_OR_NULL(test,
> --
> 2.43.0.rc2.451.g8631bc7472-goog
>