| From 8ad5b5a78a64f03b0ab2b10e29501dd44996c793 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 30 Oct 2023 10:47:58 +0000 |
| Subject: kunit: debugfs: Fix unchecked dereference in debugfs_print_results() |
| |
| From: Richard Fitzgerald <rf@opensource.cirrus.com> |
| |
| [ Upstream commit 34dfd5bb2e5507e69d9b6d6c90f546600c7a4977 ] |
| |
| Move the call to kunit_suite_has_succeeded() after the check that |
| the kunit_suite pointer is valid. |
| |
| This was found by smatch: |
| |
| lib/kunit/debugfs.c:66 debugfs_print_results() warn: variable |
| dereferenced before check 'suite' (see line 63) |
| |
| Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> |
| Reported-by: Dan Carpenter <dan.carpenter@linaro.org> |
| Fixes: 38289a26e1b8 ("kunit: fix debugfs code to use enum kunit_status, not bool") |
| Reviewed-by: Rae Moar <rmoar@google.com> |
| Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| lib/kunit/debugfs.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/lib/kunit/debugfs.c b/lib/kunit/debugfs.c |
| index b08bb1fba106..de5e71458358 100644 |
| --- a/lib/kunit/debugfs.c |
| +++ b/lib/kunit/debugfs.c |
| @@ -52,12 +52,14 @@ static void debugfs_print_result(struct seq_file *seq, |
| static int debugfs_print_results(struct seq_file *seq, void *v) |
| { |
| struct kunit_suite *suite = (struct kunit_suite *)seq->private; |
| - enum kunit_status success = kunit_suite_has_succeeded(suite); |
| + enum kunit_status success; |
| struct kunit_case *test_case; |
| |
| if (!suite) |
| return 0; |
| |
| + success = kunit_suite_has_succeeded(suite); |
| + |
| /* Print KTAP header so the debugfs log can be parsed as valid KTAP. */ |
| seq_puts(seq, "KTAP version 1\n"); |
| seq_puts(seq, "1..1\n"); |
| -- |
| 2.43.0 |
| |
