From nobody Fri Dec 19 07:28:11 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 712041BB688 for ; Fri, 30 Aug 2024 18:02:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725040965; cv=none; b=kMysJNFBqSe9M3WsvlowJVpGBIIcA0Cnyfh5JCdjwrPXLkfkFhMo6C0Vuvc2I0+0KCw2za4PTHt9sC6UDFBSf50GcxPfNs1efMNHlJkAPPUksR7yK8si+p93AlTtUIyW0guMFyhz/D+tJjP9nuUaewG4X3m8/wt+PxMevJmWBG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725040965; c=relaxed/simple; bh=2/ifAhEnGTALvpa296SBzWwfYIl4zGo62CI4oNu4e+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ISL2tCiYM81rzhSAVlt8/ANTMqX8smTR9urOtaRAu7d227Zqib/kSfarLOkX1HMmANyDBPesDN8kOV2edebMZfaoxYMGW8UsKLXxkHxY/nyFJ8lJlgxD28TWMslTHcd7uovDhIL55Y9z1qtYdfAOIyYazItvShRJAQ0uj1NGvRE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=eZ5a2GYY; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="eZ5a2GYY" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-715cc9b3fdfso100791b3a.1 for ; Fri, 30 Aug 2024 11:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1725040963; x=1725645763; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sAuPAhpR0ghb6Pn/oIDgZr3XAmYbFrFmC+BmGo7f9vo=; b=eZ5a2GYYUH1xIo/mBqoD0n12Oq/pP7v2yKHSVIJbcKL2a/bSR3fINlPLlh2OQoZjP+ tm07IE3gqUTqOUKk7+2KOiv9JIbAS8DhEHO+0G1mEVMLIsVleyr7j+lqs/+tNABNk32o qJa4VrKaKuAH5QO/R9EymjfJ6C/lzlQCsBA+Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725040963; x=1725645763; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sAuPAhpR0ghb6Pn/oIDgZr3XAmYbFrFmC+BmGo7f9vo=; b=MqYFqkhXUymrfzc5fd3e9m6ZpIYoOLPSjud6Tu2+HyRlTrZJkCrMz04usuhq3uEOvn x+Cbq9rufi4DZZS+iaZgfNJNGpbNFmPNbd0+gvgrU5rw2TpaM7ySrxAZ/T9XAnYKAHzt ruDTPwDMetYwuh5MklOvDOHrukLhyjZkVBLGekIDlWb0WeRrh5vpR//BVAUFrKahrrva 5L2d71CU8UfDlgkHkWPQm2HFywHqAkhri8LfTCRE4JRtvYym7gLOZb6WIzBY/J5/bYGm 84A2PoyI8ewWNG3bJomHCCYnqN4nJ6Sm9zRita57+1C0RPv6BOy3ZhRF2DItdf86WRHl MekQ== X-Forwarded-Encrypted: i=1; AJvYcCViNVhYVlE7EJ8yE1S6klNisqBlc/SkRdbeMy5hWQizqzZrz7c5B7QnNvcIBpqTsfNyGoQoh/fDDAvaEg0=@vger.kernel.org X-Gm-Message-State: AOJu0Yxaene0nYC90o9tlnT05wgJxQrR+QvdMIKbGzorgS1otTQ6GkDK 5dnGrFKD14Kgo1AkW3vvn8sP8GTlo8yHzf848Gln/NseiZSxF8YuWXukhVxSMQ== X-Google-Smtp-Source: AGHT+IHXhd/ntf6xjL03WH4K2Xgnu6oCFd2q6NEHWxdWLQirlAtwyd0QSPMAd8gnR3mPfhxjRDuS5A== X-Received: by 2002:a05:6a00:14c2:b0:714:2198:26ae with SMTP id d2e1a72fcca58-7173078b21dmr1711491b3a.5.1725040962275; Fri, 30 Aug 2024 11:02:42 -0700 (PDT) Received: from localhost (150.12.83.34.bc.googleusercontent.com. [34.83.12.150]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-7d22e771c48sm3304251a12.23.2024.08.30.11.02.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 30 Aug 2024 11:02:41 -0700 (PDT) From: jeffxu@chromium.org To: akpm@linux-foundation.org Cc: linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, pedro.falcato@gmail.com, willy@infradead.org, lorenzo.stoakes@oracle.com, broonie@kernel.org, vbabka@suse.cz, Liam.Howlett@oracle.com, rientjes@google.com, keescook@chromium.org, Jeff Xu Subject: [PATCH v3 1/5] selftests/mseal_test: Check vma_size, prot, error code. Date: Fri, 30 Aug 2024 18:02:33 +0000 Message-ID: <20240830180237.1220027-2-jeffxu@chromium.org> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog In-Reply-To: <20240830180237.1220027-1-jeffxu@chromium.org> References: <20240830180237.1220027-1-jeffxu@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Xu Add more checks for vma size, prot bits and api errcode after attempt of modifing sealed mappings. Signed-off-by: Jeff Xu --- tools/testing/selftests/mm/mseal_test.c | 398 ++++++++++++++++++++---- 1 file changed, 332 insertions(+), 66 deletions(-) diff --git a/tools/testing/selftests/mm/mseal_test.c b/tools/testing/selfte= sts/mm/mseal_test.c index e7991e5fdcf3..7198f2314f9b 100644 --- a/tools/testing/selftests/mm/mseal_test.c +++ b/tools/testing/selftests/mm/mseal_test.c @@ -170,18 +170,31 @@ static void set_pkey(int pkey, unsigned long pkey_val= ue) static void setup_single_address(int size, void **ptrOut) { void *ptr; + unsigned long page_size =3D getpagesize(); =20 - ptr =3D mmap(NULL, size, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - *ptrOut =3D ptr; + *ptrOut =3D (void *) MAP_FAILED; + ptr =3D mmap(NULL, size + 2 * page_size, PROT_READ, MAP_ANONYMOUS | MAP_P= RIVATE, -1, 0); + if (ptr !=3D (void *) -1) { + /* add 2 page at the beginning and end to avoid auto-merge of mapping */ + sys_mprotect(ptr, page_size, PROT_NONE); + sys_mprotect(ptr + size + page_size, page_size, PROT_NONE); + *ptrOut =3D ptr + page_size; + } } =20 static void setup_single_address_rw(int size, void **ptrOut) { void *ptr; unsigned long mapflags =3D MAP_ANONYMOUS | MAP_PRIVATE; + unsigned long page_size =3D getpagesize(); =20 - ptr =3D mmap(NULL, size, PROT_READ | PROT_WRITE, mapflags, -1, 0); - *ptrOut =3D ptr; + *ptrOut =3D (void *) MAP_FAILED; + ptr =3D mmap(NULL, size + 2 * page_size, PROT_READ | PROT_WRITE, mapflags= , -1, 0); + if (ptr !=3D (void *) -1) { + sys_mprotect(ptr, page_size, PROT_NONE); + sys_mprotect(ptr + size + page_size, page_size, PROT_NONE); + *ptrOut =3D ptr + page_size; + } } =20 static int clean_single_address(void *ptr, int size) @@ -226,6 +239,21 @@ bool pkey_supported(void) return false; } =20 +bool get_vma_size_supported(void) +{ + void *ptr; + unsigned long page_size =3D getpagesize(); + unsigned long size =3D 4 * page_size; + int prot; + + setup_single_address(size, &ptr); + size =3D get_vma_size(ptr, &prot); + if (size =3D=3D 4 * page_size && prot =3D=3D 0x4) + return true; + + return false; +} + static void test_seal_addseal(void) { int ret; @@ -419,11 +447,17 @@ static void test_seal_invalid_input(void) unsigned long size =3D 4 * page_size; int ret; =20 - setup_single_address(8 * page_size, &ptr); + setup_single_address(9 * page_size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); - ret =3D clean_single_address(ptr + 4 * page_size, 4 * page_size); + + ret =3D clean_single_address(ptr, page_size); FAIL_TEST_IF_FALSE(!ret); =20 + ret =3D clean_single_address(ptr + 5 * page_size, 4 * page_size); + FAIL_TEST_IF_FALSE(!ret); + + ptr =3D ptr + page_size; + /* invalid flag */ ret =3D syscall(__NR_mseal, ptr, size, 0x20); FAIL_TEST_IF_FALSE(ret < 0); @@ -523,6 +557,7 @@ static void test_seal_mprotect(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -533,9 +568,14 @@ static void test_seal_mprotect(bool seal) } =20 ret =3D sys_mprotect(ptr, size, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); @@ -547,6 +587,7 @@ static void test_seal_start_mprotect(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -558,9 +599,14 @@ static void test_seal_start_mprotect(bool seal) =20 /* the first page is sealed. */ ret =3D sys_mprotect(ptr, page_size, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 /* pages after the first page is not sealed. */ @@ -577,6 +623,7 @@ static void test_seal_end_mprotect(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -593,9 +640,14 @@ static void test_seal_end_mprotect(bool seal) /* last 3 page are sealed */ ret =3D sys_mprotect(ptr + page_size, page_size * 3, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr + page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 3 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); @@ -607,6 +659,7 @@ static void test_seal_mprotect_unalign_len(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -618,9 +671,14 @@ static void test_seal_mprotect_unalign_len(bool seal) =20 /* 2 pages are sealed. */ ret =3D sys_mprotect(ptr, page_size * 2, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 2 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 ret =3D sys_mprotect(ptr + page_size * 2, page_size, @@ -636,6 +694,7 @@ static void test_seal_mprotect_unalign_len_variant_2(bo= ol seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -646,9 +705,14 @@ static void test_seal_mprotect_unalign_len_variant_2(b= ool seal) =20 /* 3 pages are sealed. */ ret =3D sys_mprotect(ptr, page_size * 3, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 3 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 ret =3D sys_mprotect(ptr + page_size * 3, page_size, @@ -664,6 +728,7 @@ static void test_seal_mprotect_two_vma(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -678,16 +743,26 @@ static void test_seal_mprotect_two_vma(bool seal) } =20 ret =3D sys_mprotect(ptr, page_size * 2, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 2 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x6); + } else FAIL_TEST_IF_FALSE(!ret); =20 ret =3D sys_mprotect(ptr + page_size * 2, page_size * 2, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr + page_size * 2, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 2 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); @@ -699,6 +774,7 @@ static void test_seal_mprotect_two_vma_with_split(bool = seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -719,17 +795,27 @@ static void test_seal_mprotect_two_vma_with_split(boo= l seal) =20 /* the second page is sealed. */ ret =3D sys_mprotect(ptr + page_size, page_size, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 1 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x6); + } else FAIL_TEST_IF_FALSE(!ret); =20 /* the third page is sealed. */ ret =3D sys_mprotect(ptr + 2 * page_size, page_size, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr + 2 * page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 1 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 /* the fouth page is not sealed. */ @@ -746,6 +832,7 @@ static void test_seal_mprotect_partial_mprotect(bool se= al) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -758,9 +845,14 @@ static void test_seal_mprotect_partial_mprotect(bool s= eal) =20 /* mprotect first 2 page will fail, since the first page are sealed. */ ret =3D sys_mprotect(ptr, 2 * page_size, PROT_READ | PROT_WRITE); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 1 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); @@ -783,15 +875,15 @@ static void test_seal_mprotect_partial_mprotect_tail(= bool seal) } =20 ret =3D sys_mprotect(ptr, size, PROT_EXEC); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else - FAIL_TEST_IF_FALSE(!ret); + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); =20 - if (seal) { - FAIL_TEST_IF_FALSE(get_vma_size(ptr + page_size, &prot) > 0); + size =3D get_vma_size(ptr + page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 1 * page_size); FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); - } + } else + FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); } @@ -846,6 +938,7 @@ static void test_seal_mprotect_split(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -862,16 +955,34 @@ static void test_seal_mprotect_split(bool seal) =20 /* mprotect is sealed. */ ret =3D sys_mprotect(ptr, 2 * page_size, PROT_READ); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 1 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x6); + + size =3D get_vma_size(ptr + page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 3 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 =20 ret =3D sys_mprotect(ptr + 2 * page_size, 2 * page_size, PROT_READ); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 1 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x6); + + size =3D get_vma_size(ptr + page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 3 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); @@ -883,6 +994,7 @@ static void test_seal_mprotect_merge(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -899,9 +1011,18 @@ static void test_seal_mprotect_merge(bool seal) =20 /* 2 pages are sealed. */ ret =3D sys_mprotect(ptr, 2 * page_size, PROT_READ); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 1 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x6); + + size =3D get_vma_size(ptr + page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 1 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 /* last 2 pages are not sealed. */ @@ -917,6 +1038,7 @@ static void test_seal_munmap(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -928,9 +1050,14 @@ static void test_seal_munmap(bool seal) =20 /* 4 pages are sealed. */ ret =3D sys_munmap(ptr, size); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); @@ -948,6 +1075,7 @@ static void test_seal_munmap_two_vma(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -962,15 +1090,33 @@ static void test_seal_munmap_two_vma(bool seal) } =20 ret =3D sys_munmap(ptr, page_size * 2); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 2 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x6); + + size =3D get_vma_size(ptr + 2 * page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 2 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 ret =3D sys_munmap(ptr + page_size, page_size * 2); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 2 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x6); + + size =3D get_vma_size(ptr + 2 * page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 2 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); @@ -1018,33 +1164,75 @@ static void test_seal_munmap_partial_across_vmas(bo= ol seal) { void *ptr; unsigned long page_size =3D getpagesize(); - unsigned long size =3D 2 * page_size; + unsigned long size =3D 12 * page_size; int ret; int prot; =20 - /* - * Check if a partial mseal (that results in two vmas) works correctly. - * It might unmap the first, but it'll never unmap the second (msealed) v= ma. - */ - setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); =20 if (seal) { - ret =3D sys_mseal(ptr + page_size, page_size); + ret =3D sys_mseal(ptr + 4 * page_size, 4 * page_size); FAIL_TEST_IF_FALSE(!ret); } =20 - ret =3D sys_munmap(ptr, size); - if (seal) + ret =3D sys_munmap(ptr, 12 * page_size); + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + + size =3D get_vma_size(ptr + 4 * page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + + size =3D get_vma_size(ptr + 8 * page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 + + ret =3D sys_munmap(ptr, 6 * page_size); if (seal) { - FAIL_TEST_IF_FALSE(get_vma_size(ptr + page_size, &prot) > 0); + FAIL_TEST_IF_FALSE(ret < 0); + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + + size =3D get_vma_size(ptr + 4 * page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); - } + + size =3D get_vma_size(ptr + 8 * page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else + FAIL_TEST_IF_FALSE(!ret); + + ret =3D sys_munmap(ptr + 6 * page_size, 6 * page_size); + if (seal) { + FAIL_TEST_IF_FALSE(ret < 0); + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + + size =3D get_vma_size(ptr + 4 * page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + + size =3D get_vma_size(ptr + 8 * page_size, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else + FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); } @@ -1074,9 +1262,11 @@ static void test_munmap_start_freed(bool seal) ret =3D sys_munmap(ptr, size); if (seal) { FAIL_TEST_IF_FALSE(ret < 0); + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); =20 size =3D get_vma_size(ptr + page_size, &prot); - FAIL_TEST_IF_FALSE(size =3D=3D page_size * 3); + FAIL_TEST_IF_FALSE(size =3D=3D 3 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else { /* note: this will be OK, even the first page is */ /* already unmapped. */ @@ -1095,6 +1285,7 @@ static void test_munmap_end_freed(bool seal) unsigned long page_size =3D getpagesize(); unsigned long size =3D 4 * page_size; int ret; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1111,9 +1302,14 @@ static void test_munmap_end_freed(bool seal) =20 /* unmap all pages. */ ret =3D sys_munmap(ptr, size); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 3 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(!ret); =20 REPORT_TEST_PASS(); @@ -1144,12 +1340,15 @@ static void test_munmap_middle_freed(bool seal) ret =3D sys_munmap(ptr, size); if (seal) { FAIL_TEST_IF_FALSE(ret < 0); + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); =20 size =3D get_vma_size(ptr, &prot); FAIL_TEST_IF_FALSE(size =3D=3D page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); =20 size =3D get_vma_size(ptr + page_size * 3, &prot); FAIL_TEST_IF_FALSE(size =3D=3D page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else { FAIL_TEST_IF_FALSE(!ret); =20 @@ -1170,6 +1369,7 @@ static void test_seal_mremap_shrink(bool seal) unsigned long size =3D 4 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1184,6 +1384,10 @@ static void test_seal_mremap_shrink(bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D (void *) MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else { FAIL_TEST_IF_FALSE(ret2 !=3D (void *) MAP_FAILED); =20 @@ -1199,6 +1403,7 @@ static void test_seal_mremap_expand(bool seal) unsigned long size =3D 4 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1216,6 +1421,10 @@ static void test_seal_mremap_expand(bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 2 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else { FAIL_TEST_IF_FALSE(ret2 =3D=3D ptr); =20 @@ -1231,6 +1440,7 @@ static void test_seal_mremap_move(bool seal) unsigned long size =3D page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1249,10 +1459,12 @@ static void test_seal_mremap_move(bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); - } else { - FAIL_TEST_IF_FALSE(ret2 !=3D MAP_FAILED); =20 - } + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else + FAIL_TEST_IF_FALSE(ret2 !=3D MAP_FAILED); =20 REPORT_TEST_PASS(); } @@ -1264,6 +1476,7 @@ static void test_seal_mmap_overwrite_prot(bool seal) unsigned long size =3D page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1279,6 +1492,10 @@ static void test_seal_mmap_overwrite_prot(bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else FAIL_TEST_IF_FALSE(ret2 =3D=3D ptr); =20 @@ -1292,6 +1509,7 @@ static void test_seal_mmap_expand(bool seal) unsigned long size =3D 12 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1310,6 +1528,10 @@ static void test_seal_mmap_expand(bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 8 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else FAIL_TEST_IF_FALSE(ret2 =3D=3D ptr); =20 @@ -1323,6 +1545,7 @@ static void test_seal_mmap_shrink(bool seal) unsigned long size =3D 12 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1338,6 +1561,10 @@ static void test_seal_mmap_shrink(bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 12 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else FAIL_TEST_IF_FALSE(ret2 =3D=3D ptr); =20 @@ -1352,6 +1579,7 @@ static void test_seal_mremap_shrink_fixed(bool seal) unsigned long size =3D 4 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1369,6 +1597,10 @@ static void test_seal_mremap_shrink_fixed(bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else FAIL_TEST_IF_FALSE(ret2 =3D=3D newAddr); =20 @@ -1383,6 +1615,7 @@ static void test_seal_mremap_expand_fixed(bool seal) unsigned long size =3D 4 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(page_size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1400,6 +1633,10 @@ static void test_seal_mremap_expand_fixed(bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(newAddr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else FAIL_TEST_IF_FALSE(ret2 =3D=3D newAddr); =20 @@ -1414,6 +1651,7 @@ static void test_seal_mremap_move_fixed(bool seal) unsigned long size =3D 4 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1430,6 +1668,10 @@ static void test_seal_mremap_move_fixed(bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(newAddr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else FAIL_TEST_IF_FALSE(ret2 =3D=3D newAddr); =20 @@ -1443,6 +1685,7 @@ static void test_seal_mremap_move_fixed_zero(bool sea= l) unsigned long size =3D 4 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1460,9 +1703,12 @@ static void test_seal_mremap_move_fixed_zero(bool se= al) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); - } else { + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); + } else FAIL_TEST_IF_FALSE(ret2 =3D=3D 0); - } =20 REPORT_TEST_PASS(); } @@ -1474,6 +1720,7 @@ static void test_seal_mremap_move_dontunmap(bool seal) unsigned long size =3D 4 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1488,6 +1735,10 @@ static void test_seal_mremap_move_dontunmap(bool sea= l) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else { /* kernel will allocate a new address */ FAIL_TEST_IF_FALSE(ret2 !=3D MAP_FAILED); @@ -1503,6 +1754,7 @@ static void test_seal_mremap_move_dontunmap_anyaddr(b= ool seal) unsigned long size =3D 4 * page_size; int ret; void *ret2; + int prot; =20 setup_single_address(size, &ptr); FAIL_TEST_IF_FALSE(ptr !=3D (void *)-1); @@ -1529,6 +1781,10 @@ static void test_seal_mremap_move_dontunmap_anyaddr(= bool seal) if (seal) { FAIL_TEST_IF_FALSE(ret2 =3D=3D MAP_FAILED); FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + + size =3D get_vma_size(ptr, &prot); + FAIL_TEST_IF_FALSE(size =3D=3D 4 * page_size); + FAIL_TEST_IF_FALSE(prot =3D=3D 0x4); } else { /* remap success and return ptr2 */ FAIL_TEST_IF_FALSE(ret2 =3D=3D ptr2); @@ -1690,9 +1946,10 @@ static void test_seal_discard_ro_anon_on_pkey(bool s= eal) /* sealing will take effect if PKRU deny write. */ set_pkey(pkey, PKEY_DISABLE_WRITE); ret =3D sys_madvise(ptr, size, MADV_DONTNEED); - if (seal) + if (seal) { FAIL_TEST_IF_FALSE(ret < 0); - else + FAIL_TEST_IF_FALSE(errno =3D=3D EPERM); + } else FAIL_TEST_IF_FALSE(!ret); =20 /* base seal still apply. */ @@ -1876,6 +2133,15 @@ int main(int argc, char **argv) if (!pkey_supported()) ksft_print_msg("PKEY not supported\n"); =20 + /* + * Possible reasons: + * - unable to read /proc/pid/maps (unlikely) + * - parsing error when reading /proc/pid/maps,e.g. len is not expected. + * Is this "TOPDOWN" mapping or format change in /proc/pid/maps ? + */ + if (!get_vma_size_supported()) + ksft_exit_skip("get_vma_size not supported\n"); + ksft_set_plan(88); =20 test_seal_addseal(); --=20 2.46.0.469.g59c65b2a67-goog