| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20240830180237.1220027-6-jeffxu@chromium.org>
Date: Fri, 30 Aug 2024 18:02:37 +0000
From: jeffxu@...omium.org
To: akpm@...ux-foundation.org
Cc: linux-kselftest@...r.kernel.org,
linux-mm@...ck.org,
linux-hardening@...r.kernel.org,
linux-kernel@...r.kernel.org,
pedro.falcato@...il.com,
willy@...radead.org,
lorenzo.stoakes@...cle.com,
broonie@...nel.org,
vbabka@...e.cz,
Liam.Howlett@...cle.com,
rientjes@...gle.com,
keescook@...omium.org,
Jeff Xu <jeffxu@...omium.org>
Subject: [PATCH v3 5/5] selftests/mseal: add more tests for mremap
From: Jeff Xu <jeffxu@...omium.org>
Add sealing test to cover mremap for
Expand/shrink/move across vmas.
Signed-off-by: Jeff Xu <jeffxu@...omium.org>
---
tools/testing/selftests/mm/mseal_test.c | 202 +++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/mm/mseal_test.c b/tools/testing/selftests/mm/mseal_test.c
index 3516389034a7..fee655bbbf0a 100644
--- a/tools/testing/selftests/mm/mseal_test.c
+++ b/tools/testing/selftests/mm/mseal_test.c
@@ -2339,6 +2339,197 @@ static void test_seal_mmap_reuse_addr(bool seal)
REPORT_TEST_PASS();
}
+static void test_seal_mremap_shrink_multiple_vmas(bool seal)
+{
+ void *ptr;
+ unsigned long page_size = getpagesize();
+ unsigned long size = 12 * page_size;
+ int ret;
+ void *ret2;
+ int prot;
+
+ setup_single_address(size, &ptr);
+ FAIL_TEST_IF_FALSE(ptr != (void *)-1);
+
+ ret = sys_mprotect(ptr + 4 * page_size, 4 * page_size, PROT_NONE);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ if (seal) {
+ ret = sys_mseal(ptr + 4 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+ }
+
+ ret2 = sys_mremap(ptr, 12 * page_size, 6 * page_size, 0, 0);
+ if (seal) {
+ FAIL_TEST_IF_FALSE(ret2 == (void *) MAP_FAILED);
+ FAIL_TEST_IF_FALSE(errno == EPERM);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ } else {
+ FAIL_TEST_IF_FALSE(ret2 == ptr);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 2 * page_size);
+ }
+
+ REPORT_TEST_PASS();
+}
+
+static void test_seal_mremap_expand_multiple_vmas(bool seal)
+{
+ void *ptr;
+ unsigned long page_size = getpagesize();
+ unsigned long size = 12 * page_size;
+ int ret;
+ void *ret2;
+ int prot;
+
+ setup_single_address(size, &ptr);
+ FAIL_TEST_IF_FALSE(ptr != (void *)-1);
+
+ ret = sys_mprotect(ptr + 4 * page_size, 4 * page_size, PROT_NONE);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ /* ummap last 4 pages. */
+ ret = sys_munmap(ptr + 8 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ if (seal) {
+ ret = sys_mseal(ptr + 4 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+ }
+
+ ret2 = sys_mremap(ptr, 8 * page_size, 12 * page_size, 0, 0);
+ FAIL_TEST_IF_FALSE(ret2 == (void *) MAP_FAILED);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ REPORT_TEST_PASS();
+}
+
+static void test_seal_mremap_move_expand_multiple_vmas(bool seal)
+{
+ void *ptr;
+ unsigned long page_size = getpagesize();
+ unsigned long size = 12 * page_size;
+ int ret;
+ void *ret2;
+ int prot;
+ void *ptr2;
+
+ setup_single_address(size, &ptr);
+ FAIL_TEST_IF_FALSE(ptr != (void *)-1);
+
+ setup_single_address(size, &ptr2);
+ FAIL_TEST_IF_FALSE(ptr2 != (void *)-1);
+
+ ret = sys_munmap(ptr2, 12 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ ret = sys_mprotect(ptr + 4 * page_size, 4 * page_size, PROT_NONE);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ /* ummap last 4 pages. */
+ ret = sys_munmap(ptr + 8 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ if (seal) {
+ ret = sys_mseal(ptr + 4 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+ }
+
+ /* move and expand cross VMA boundary will fail */
+ ret2 = sys_mremap(ptr, 8 * page_size, 10 * page_size, MREMAP_FIXED | MREMAP_MAYMOVE, ptr2);
+ FAIL_TEST_IF_FALSE(ret2 == (void *) MAP_FAILED);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ REPORT_TEST_PASS();
+}
+
+static void test_seal_mremap_move_shrink_multiple_vmas(bool seal)
+{
+ void *ptr;
+ unsigned long page_size = getpagesize();
+ unsigned long size = 12 * page_size;
+ int ret;
+ void *ret2;
+ int prot;
+ void *ptr2;
+
+ setup_single_address(size, &ptr);
+ FAIL_TEST_IF_FALSE(ptr != (void *)-1);
+
+ setup_single_address(size, &ptr2);
+ FAIL_TEST_IF_FALSE(ptr2 != (void *)-1);
+
+ ret = sys_munmap(ptr2, 12 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ ret = sys_mprotect(ptr + 4 * page_size, 4 * page_size, PROT_NONE);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 0);
+
+ if (seal) {
+ ret = sys_mseal(ptr + 4 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+ }
+
+ /* move and shrink cross VMA boundary is NOK */
+ ret2 = sys_mremap(ptr, 12 * page_size, 8 * page_size, MREMAP_FIXED | MREMAP_MAYMOVE, ptr2);
+ FAIL_TEST_IF_FALSE(ret2 == (void *) MAP_FAILED);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 0);
+
+ REPORT_TEST_PASS();
+}
+
int main(int argc, char **argv)
{
bool test_seal = seal_support();
@@ -2360,7 +2551,7 @@ int main(int argc, char **argv)
if (!get_vma_size_supported())
ksft_exit_skip("get_vma_size not supported\n");
- ksft_set_plan(97);
+ ksft_set_plan(105);
test_seal_addseal();
test_seal_unmapped_start();
@@ -2481,5 +2672,14 @@ int main(int argc, char **argv)
test_seal_mmap_reuse_addr(false);
test_seal_mmap_reuse_addr(true);
+ test_seal_mremap_shrink_multiple_vmas(false);
+ test_seal_mremap_shrink_multiple_vmas(true);
+ test_seal_mremap_expand_multiple_vmas(false);
+ test_seal_mremap_expand_multiple_vmas(true);
+ test_seal_mremap_move_expand_multiple_vmas(false);
+ test_seal_mremap_move_expand_multiple_vmas(true);
+ test_seal_mremap_move_shrink_multiple_vmas(false);
+ test_seal_mremap_move_shrink_multiple_vmas(true);
+
ksft_finished();
}
--
2.46.0.469.g59c65b2a67-goog
Powered by blists - more mailing lists