[PATCH] kunit: executor: Fix a memory leak on failure in kunit_filter_tests

0 views
Skip to first unread message

David Gow

unread,
Jul 12, 2022, 5:56:41 AMJul 12
to Daniel Latypov, Brendan Higgins, Shuah Khan, David Gow, kuni...@googlegroups.com, linux-k...@vger.kernel.org, Linux Kernel Mailing List, ll...@lists.linux.dev, kernel test robot
It's possible that memory allocation for the copy will fail, but for the
copy of the suite to succeed. In this case, the copy could be leaked.

Properly free 'copy' in the error case for the allocation of 'filtered'
failing.

Note that there may also have been a similar issue in
kunit_filter_subsuites, before it was removed in "kunit: flatten
kunit_suite*** to kunit_suite** in .kunit_test_suites".

This was reported by clang-analyzer via the kernel test robot, here:
https://lore.kernel.org/all/c8073b8e-7b9e-0830...@intel.com/

Fixes: a02353f49162 ("kunit: bail out of test filtering logic quicker if OOM")
Reported-by: kernel test robot <yuji...@intel.com>
Signed-off-by: David Gow <davi...@google.com>
---
lib/kunit/executor.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c
index 6c489d6c5e5d..5e223327196a 100644
--- a/lib/kunit/executor.c
+++ b/lib/kunit/executor.c
@@ -74,8 +74,10 @@ kunit_filter_tests(const struct kunit_suite *const suite, const char *test_glob)
return ERR_PTR(-ENOMEM);

filtered = kcalloc(n + 1, sizeof(*filtered), GFP_KERNEL);
- if (!filtered)
+ if (!filtered) {
+ kfree(copy);
return ERR_PTR(-ENOMEM);
+ }

n = 0;
kunit_suite_for_each_test_case(suite, test_case) {
--
2.37.0.144.g8ac04bfd2-goog

Yujie Liu

unread,
Jul 12, 2022, 1:54:58 PMJul 12
to David Gow, kuni...@googlegroups.com, linux-k...@vger.kernel.org, Linux Kernel Mailing List, ll...@lists.linux.dev, Shuah Khan, Brendan Higgins, Daniel Latypov
Hi David,

On 7/12/2022 17:56, David Gow wrote:
> It's possible that memory allocation for the copy will fail, but for the

I think it is "for the _filtered_ will fail". Maybe a typo?

Thanks,
Yujie

Daniel Latypov

unread,
Jul 12, 2022, 5:27:22 PMJul 12
to David Gow, Brendan Higgins, Shuah Khan, kuni...@googlegroups.com, linux-k...@vger.kernel.org, Linux Kernel Mailing List, ll...@lists.linux.dev, kernel test robot
On Tue, Jul 12, 2022 at 2:56 AM David Gow <davi...@google.com> wrote:
>
> It's possible that memory allocation for the copy will fail, but for the
> copy of the suite to succeed. In this case, the copy could be leaked.
>
> Properly free 'copy' in the error case for the allocation of 'filtered'
> failing.
>
> Note that there may also have been a similar issue in
> kunit_filter_subsuites, before it was removed in "kunit: flatten
> kunit_suite*** to kunit_suite** in .kunit_test_suites".
>
> This was reported by clang-analyzer via the kernel test robot, here:
> https://lore.kernel.org/all/c8073b8e-7b9e-0830...@intel.com/
>
> Fixes: a02353f49162 ("kunit: bail out of test filtering logic quicker if OOM")
> Reported-by: kernel test robot <yuji...@intel.com>
> Signed-off-by: David Gow <davi...@google.com>

Reviewed-by: Daniel Latypov <dlat...@google.com>

Thanks for taking care of this.

Brendan Higgins

unread,
Jul 12, 2022, 5:30:33 PMJul 12
to David Gow, Daniel Latypov, Shuah Khan, kuni...@googlegroups.com, linux-k...@vger.kernel.org, Linux Kernel Mailing List, ll...@lists.linux.dev, kernel test robot
On Tue, Jul 12, 2022 at 5:56 AM David Gow <davi...@google.com> wrote:
>
> It's possible that memory allocation for the copy will fail, but for the
> copy of the suite to succeed. In this case, the copy could be leaked.
>
> Properly free 'copy' in the error case for the allocation of 'filtered'
> failing.
>
> Note that there may also have been a similar issue in
> kunit_filter_subsuites, before it was removed in "kunit: flatten
> kunit_suite*** to kunit_suite** in .kunit_test_suites".
>
> This was reported by clang-analyzer via the kernel test robot, here:
> https://lore.kernel.org/all/c8073b8e-7b9e-0830...@intel.com/
>
> Fixes: a02353f49162 ("kunit: bail out of test filtering logic quicker if OOM")
> Reported-by: kernel test robot <yuji...@intel.com>
> Signed-off-by: David Gow <davi...@google.com>

Reviewed-by: Brendan Higgins <brendan...@google.com>

David Gow

unread,
Jul 12, 2022, 7:25:36 PMJul 12
to Daniel Latypov, Brendan Higgins, Shuah Khan, David Gow, kuni...@googlegroups.com, linux-k...@vger.kernel.org, Linux Kernel Mailing List, ll...@lists.linux.dev, kernel test robot, kernel test robot, Dan Carpenter
It's possible that memory allocation for 'filtered' will fail, but for the
copy of the suite to succeed. In this case, the copy could be leaked.

Properly free 'copy' in the error case for the allocation of 'filtered'
failing.

Note that there may also have been a similar issue in
kunit_filter_subsuites, before it was removed in "kunit: flatten
kunit_suite*** to kunit_suite** in .kunit_test_suites".

This was reported by clang-analyzer via the kernel test robot, here:
https://lore.kernel.org/all/c8073b8e-7b9e-0830...@intel.com/

And by smatch via Dan Carpenter and the kernel test robot:
https://lore.kernel.org/all/202207101328...@intel.com/

Fixes: a02353f49162 ("kunit: bail out of test filtering logic quicker if OOM")
Reported-by: kernel test robot <yuji...@intel.com>
Reported-by: kernel test robot <l...@intel.com>
Reported-by: Dan Carpenter <dan.ca...@oracle.com>
Reviewed-by: Daniel Latypov <dlat...@google.com>
Reviewed-by: Brendan Higgins <brendan...@google.com>
Signed-off-by: David Gow <davi...@google.com>
---

Thanks everyone! No actual code changes in v2, just fixes to the
description.

Changes since v1:
https://lore.kernel.org/all/20220712095627.1...@google.com/
- Fix a mistake in the commit description where we noted the allocation
for 'copy' could fail, instead of 'filtered'. (Thanks Yujie!)
- Noted in the description that smatch also found this (Thanks Dan!)
- Added the extra Reported-by and Reviewed-by tags.

---
lib/kunit/executor.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c
index 6c489d6c5e5d..5e223327196a 100644
--- a/lib/kunit/executor.c
+++ b/lib/kunit/executor.c
@@ -74,8 +74,10 @@ kunit_filter_tests(const struct kunit_suite *const suite, const char *test_glob)
return ERR_PTR(-ENOMEM);

filtered = kcalloc(n + 1, sizeof(*filtered), GFP_KERNEL);
- if (!filtered)
+ if (!filtered) {
+ kfree(copy);
return ERR_PTR(-ENOMEM);
+ }

n = 0;
kunit_suite_for_each_test_case(suite, test_case) {
--
2.37.0.144.g8ac04bfd2-goog

Reply all
Reply to author
Forward
0 new messages