diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 123d1ae441bb..25c57923574a 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -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();