shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

BACKPORT: kasan: simplify kasan_update_kunit_status() and call sites

Browse Source 
(Backport: fix conflicts with d9f210a14d, which drops the KUNIT ifdefs.)

 - Rename kasan_update_kunit_status() to update_kunit_status() (the
   function is static).

 - Move the IS_ENABLED(CONFIG_KUNIT) to the function's definition
   instead of duplicating it at call sites.

 - Obtain and check current->kunit_test within the function.

Link: https://lkml.kernel.org/r/dac26d811ae31856c3d7666de0b108a3735d962d.1646237226.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Marco Elver <elver@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Bug: 254721825
(cherry picked from commit 3784c299ea)
Change-Id: I3024e0390d7fdb95ad763aa02666a156e4083c3e
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
This commit is contained in:
Andrey Konovalov
2022-03-24 18:12:31 -07:00
committed by Todd Kjos
parent b7e35234eb
commit 80fcd42def
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mm/kasan/report.c
View File

@@ -347,21 +347,26 @@ static bool report_enabled(void)
return !test_and_set_bit(KASAN_BIT_REPORTED, &kasan_flags);
}
static void kasan_update_kunit_status(struct kunit *cur_test, bool sync)
static void update_kunit_status(bool sync)
{
struct kunit *test;
struct kunit_resource *resource;
struct kunit_kasan_status *status;
resource = kunit_find_named_resource(cur_test, "kasan_status");
test = current->kunit_test;
if (!test)
return;
resource = kunit_find_named_resource(test, "kasan_status");
if (!resource) {
kunit_set_failure(cur_test);
kunit_set_failure(test);
return;
}
status = (struct kunit_kasan_status *)resource->data;
WRITE_ONCE(status->report_found, true);
WRITE_ONCE(status->sync_fault, sync);
kunit_put_resource(resource);
}
@@ -372,8 +377,7 @@ void kasan_report_invalid_free(void *object, unsigned long ip)
object = kasan_reset_tag(object);
if (current->kunit_test)
kasan_update_kunit_status(current->kunit_test, true);
update_kunit_status(true);
start_report(&flags);
pr_err("BUG: KASAN: double-free or invalid-free in %pS\n", (void *)ip);
@@ -389,8 +393,7 @@ void kasan_report_async(void)
{
unsigned long flags;
if (current->kunit_test)
kasan_update_kunit_status(current->kunit_test, false);
update_kunit_status(false);
start_report(&flags);
pr_err("BUG: KASAN: invalid-access\n");
@@ -409,8 +412,7 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write,
void *untagged_addr;
unsigned long flags;
if (current->kunit_test)
kasan_update_kunit_status(current->kunit_test, true);
update_kunit_status(true);
disable_trace_on_warning();