diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-02 09:15:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-02 09:15:28 -0700 |
| commit | 00a8c352dd7581961fd0f284c6fc1a17b370d0f4 (patch) | |
| tree | 92142d3913359374bbac68a7ce7fb5e98666aa2e /lib | |
| parent | 83814698cf48ce3aadc5d88a3f577f04482ff92a (diff) | |
| parent | 99a6087dfdc65303d26ab5fba2dacd8931b82b08 (diff) | |
Merge tag 'hardening-v6.10-rc2-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fixes from Kees Cook:
- scsi: mpt3sas: Avoid possible run-time warning with long manufacturer
strings
- mailmap: update entry for Kees Cook
- kunit/fortify: Remove __kmalloc_node() test
* tag 'hardening-v6.10-rc2-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
kunit/fortify: Remove __kmalloc_node() test
mailmap: update entry for Kees Cook
scsi: mpt3sas: Avoid possible run-time warning with long manufacturer strings
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fortify_kunit.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/fortify_kunit.c b/lib/fortify_kunit.c index 39da5b3bc649..f9cc467334ce 100644 --- a/lib/fortify_kunit.c +++ b/lib/fortify_kunit.c @@ -236,9 +236,6 @@ static void fortify_test_alloc_size_##allocator##_dynamic(struct kunit *test) \ kfree(p)); \ checker(expected_size, __kmalloc(alloc_size, gfp), \ kfree(p)); \ - checker(expected_size, \ - __kmalloc_node(alloc_size, gfp, NUMA_NO_NODE), \ - kfree(p)); \ \ orig = kmalloc(alloc_size, gfp); \ KUNIT_EXPECT_TRUE(test, orig != NULL); \ |