Received-SPF: pass (google.com: domain of linux-kernel+bounces-141834-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Fri, 12 Apr 2024 10:59:01 +0800
Precedence: bulk
Mime-Version: 1.0
Message-ID: <20240412025903.489470-1-davidgow@google.com>
Subject: [PATCH] kunit: Fix race condition in try-catch completion
From: David Gow <davidgow@google.com>
To: Rae Moar <rmoar@google.com>, Kees Cook <keescook@chromium.org>, 
	"=?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?=" <mic@digikod.net>, Naresh Kamboju <naresh.kamboju@linaro.org>, 
	Shuah Khan <skhan@linuxfoundation.org>
Cc: David Gow <davidgow@google.com>, Will Deacon <will@kernel.org>, 
	Dan Carpenter <dan.carpenter@linaro.org>, Guenter Roeck <linux@roeck-us.net>, 
	linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, 
	linux-kernel@vger.kernel.org, Brendan Higgins <brendan.higgins@linux.dev>, 
	Linux Kernel Functional Testing <lkft@linaro.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

KUnit's try-catch infrastructure now uses vfork_done, which is always
set to a valid completion when a kthread is created, but which is set to
NULL once the thread terminates. This creates a race condition, where
the kthread exits before we can wait on it.

Keep a copy of vfork_done, which is taken before we wake_up_process()
and so valid, and wait on that instead.

Fixes: 4de2a8e4cca4 ("kunit: Handle test faults")
Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
Closes: https://lore.kernel.org/lkml/20240410102710.35911-1-naresh.kamboju@=
linaro.org/
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Acked-by: Micka=C3=ABl Sala=C3=BCn <mic@digikod.net>
Signed-off-by: David Gow <davidgow@google.com>
---
 lib/kunit/try-catch.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
index fa687278ccc9..6bbe0025b079 100644
--- a/lib/kunit/try-catch.c
+++ b/lib/kunit/try-catch.c
@@ -63,6 +63,7 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catc=
h, void *context)
 {
 	struct kunit *test =3D try_catch->test;
 	struct task_struct *task_struct;
+	struct completion *task_done;
 	int exit_code, time_remaining;
=20
 	try_catch->context =3D context;
@@ -75,13 +76,16 @@ void kunit_try_catch_run(struct kunit_try_catch *try_ca=
tch, void *context)
 		return;
 	}
 	get_task_struct(task_struct);
-	wake_up_process(task_struct);
 	/*
 	 * As for a vfork(2), task_struct->vfork_done (pointing to the
 	 * underlying kthread->exited) can be used to wait for the end of a
-	 * kernel thread.
+	 * kernel thread. It is set to NULL when the thread exits, so we
+	 * keep a copy here.
 	 */
-	time_remaining =3D wait_for_completion_timeout(task_struct->vfork_done,
+	task_done =3D task_struct->vfork_done;
+	wake_up_process(task_struct);
+
+	time_remaining =3D wait_for_completion_timeout(task_done,
 						     kunit_test_timeout());
 	if (time_remaining =3D=3D 0) {
 		try_catch->try_result =3D -ETIMEDOUT;
--=20
2.44.0.683.g7961c838ac-goog