[LTP] [PATCH 2/3] mmap03: Convert to new API
Ricardo B. Marliere
rbm@suse.com
Tue Jan 14 23:26:32 CET 2025
From: Ricardo B. Marliere <rbm@suse.com>
Also add x86_64 if PKU is enabled.
Signed-off-by: Ricardo B. Marliere <rbm@suse.com>
---
testcases/kernel/syscalls/mmap/mmap03.c | 274 ++++++++++++--------------------
1 file changed, 99 insertions(+), 175 deletions(-)
diff --git a/testcases/kernel/syscalls/mmap/mmap03.c b/testcases/kernel/syscalls/mmap/mmap03.c
index 9d94d2653661387d22f811cd959a87b8112c1167..8990acbecfb8dcad174df3a56fa512a39be16478 100644
--- a/testcases/kernel/syscalls/mmap/mmap03.c
+++ b/testcases/kernel/syscalls/mmap/mmap03.c
@@ -1,230 +1,154 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) International Business Machines Corp., 2001
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (c) 2025 Linux Test Project
+ * 07/2001 Ported by Wayne Boyer
*/
-/*
- * Test Description:
- * Call mmap() to map a file creating a mapped region with execute access
- * under the following conditions -
- * - The prot parameter is set to PROT_EXE
- * - The file descriptor is open for read
- * - The file being mapped has execute permission bit set.
- * - The minimum file permissions should be 0555.
+/*\
+ * [Description]
*
- * The call should succeed to map the file creating mapped memory with the
- * required attributes.
+ * Call mmap() to map a file creating a mapped region with execute access
+ * under the following conditions:
+ * - The prot parameter is set to PROT_EXEC
+ * - The file descriptor is open for read
+ * - The file being mapped has execute permission bit set
+ * - The minimum file permissions should be 0555
+ * The call should succeed to map the file creating mapped memory with the
+ * required attributes.
*
- * Expected Result:
- * mmap() should succeed returning the address of the mapped region,
- * and the mapped region should contain the contents of the mapped file.
- * but with ia64 and PARISC/hppa,
- * an attempt to access the contents of the mapped region should give
- * rise to the signal SIGSEGV.
- *
- * HISTORY
- * 07/2001 Ported by Wayne Boyer
+ * mmap() should succeed returning the address of the mapped region,
+ * and the mapped region should contain the contents of the mapped file.
+ * but with ia64, PARISC/hppa and x86_64 (with PKU), an attempt to access
+ * the contents of the mapped region should give rise to the signal SIGSEGV.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <setjmp.h>
-#include "test.h"
+#include <setjmp.h>
+#include <stdlib.h>
-#define TEMPFILE "mmapfile"
+#include "tst_kconfig.h"
+#include "tst_test.h"
-char *TCID = "mmap03";
-int TST_TOTAL = 1;
+#define TEMPFILE "mmapfile"
static size_t page_sz;
static char *addr;
static char *dummy;
static int fildes;
-static volatile int pass = 0;
+static volatile int sig_flag = -1;
static sigjmp_buf env;
-static void setup(void);
-static void cleanup(void);
-static void sig_handler(int sig);
-
-int main(int ac, char **av)
+/*
+ * This function gets executed when the test process receives the signal
+ * SIGSEGV while trying to access the contents of memory which is not accessible.
+ */
+static void sig_handler(int sig)
{
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- /*
- * Call mmap to map the temporary file 'TEMPFILE'
- * with execute access.
- */
- errno = 0;
- addr = mmap(0, page_sz, PROT_EXEC,
- MAP_FILE | MAP_SHARED, fildes, 0);
-
- /* Check for the return value of mmap() */
- if (addr == MAP_FAILED) {
- tst_resm(TFAIL | TERRNO, "mmap() failed on %s",
- TEMPFILE);
- continue;
- }
-
- /*
- * Read the file contents into the dummy
- * variable.
- */
- if (read(fildes, dummy, page_sz) < 0) {
- tst_brkm(TFAIL | TERRNO, cleanup,
- "reading %s failed", TEMPFILE);
- }
-
- /*
- * Check whether the mapped memory region
- * has the file contents.
- *
- * with ia64 and PARISC/hppa, this should
- * generate a SIGSEGV which will be caught below.
- *
- */
-
- if (sigsetjmp(env, 1) == 0) {
- if (memcmp(dummy, addr, page_sz)) {
- tst_resm(TFAIL,
- "mapped memory region "
- "contains invalid data");
- } else {
- tst_resm(TPASS,
- "mmap() functionality is "
- "correct");
- }
- }
-#if defined(__ia64__) || defined(__hppa__) || defined(__mips__)
- if (pass) {
- tst_resm(TPASS, "Got SIGSEGV as expected");
- } else {
- tst_resm(TFAIL, "Mapped memory region with NO "
- "access is accessible");
- }
-#endif
-
- /* Clean up things in case we are looping */
- /* Unmap the mapped memory */
- if (munmap(addr, page_sz) != 0) {
- tst_brkm(TFAIL | TERRNO, cleanup,
- "failed to unmap the mmapped pages");
- }
- pass = 0;
-
+ if (sig == SIGSEGV) {
+ /* Set the global variable and jump back */
+ sig_flag = 1;
+ siglongjmp(env, 1);
+ } else {
+ tst_brk(TBROK, "received an unexpected signal: %d", sig);
}
-
- cleanup();
- tst_exit();
}
static void setup(void)
{
char *tst_buff;
- tst_sig(NOFORK, sig_handler, cleanup);
-
- TEST_PAUSE;
+ SAFE_SIGNAL(SIGSEGV, sig_handler);
page_sz = getpagesize();
/* Allocate space for the test buffer */
- if ((tst_buff = calloc(page_sz, sizeof(char))) == NULL) {
- tst_brkm(TFAIL, NULL, "calloc failed (tst_buff)");
- }
+ tst_buff = SAFE_CALLOC(page_sz, sizeof(char));
/* Fill the test buffer with the known data */
memset(tst_buff, 'A', page_sz);
- tst_tmpdir();
-
- /* Creat a temporary file used for mapping */
- if ((fildes = open(TEMPFILE, O_WRONLY | O_CREAT, 0666)) < 0) {
- free(tst_buff);
- tst_brkm(TFAIL | TERRNO, cleanup, "opening %s failed",
- TEMPFILE);
- }
+ /* Create a temporary file used for mapping */
+ fildes = SAFE_OPEN(TEMPFILE, O_WRONLY | O_CREAT);
/* Write test buffer contents into temporary file */
- if (write(fildes, tst_buff, page_sz) < (long)page_sz) {
- free(tst_buff);
- tst_brkm(TFAIL | TERRNO, cleanup, "writing to %s failed",
- TEMPFILE);
- }
+ SAFE_WRITE(SAFE_WRITE_ALL, fildes, tst_buff, page_sz);
/* Free the memory allocated for test buffer */
free(tst_buff);
/* Make sure proper permissions set on file */
- if (fchmod(fildes, 0555) < 0) {
- tst_brkm(TFAIL, cleanup, "fchmod of %s failed", TEMPFILE);
- }
+ SAFE_FCHMOD(fildes, 0555);
/* Close the temporary file opened for write */
- if (close(fildes) < 0) {
- tst_brkm(TFAIL | TERRNO, cleanup, "closing %s failed",
- TEMPFILE);
- }
+ SAFE_CLOSE(fildes);
/* Allocate and initialize dummy string of system page size bytes */
- if ((dummy = calloc(page_sz, sizeof(char))) == NULL) {
- tst_brkm(TFAIL, cleanup, "calloc failed (dummy)");
- }
+ dummy = SAFE_CALLOC(page_sz, sizeof(char));
/* Open the temporary file again for reading */
- if ((fildes = open(TEMPFILE, O_RDONLY)) < 0) {
- tst_brkm(TFAIL | TERRNO, cleanup,
- "opening %s read-only failed", TEMPFILE);
- }
+ fildes = SAFE_OPEN(TEMPFILE, O_RDONLY);
}
-/*
- * This function gets executed when the test process receives
- * the signal SIGSEGV while trying to access the contents of memory which
- * is not accessible.
- */
-static void sig_handler(int sig)
+static void run(void)
{
- if (sig == SIGSEGV) {
- /* set the global variable and jump back */
- pass = 1;
- siglongjmp(env, 1);
- } else
- tst_brkm(TBROK, cleanup, "received an unexpected signal");
+ addr = SAFE_MMAP(0, page_sz, PROT_EXEC, MAP_FILE | MAP_SHARED, fildes,
+ 0);
+
+ /* Read the file contents into the dummy variable. */
+ SAFE_READ(0, fildes, dummy, page_sz);
+
+ /*
+ * Check whether the mapped memory region
+ * has the file contents. With ia64, PARISC/hppa and x86_64 (with PKU),
+ * this should generate a SIGSEGV which will be caught below.
+ */
+ if (sigsetjmp(env, 1) == 0) {
+ if (memcmp(dummy, addr, page_sz)) {
+ tst_res(TINFO, "memcmp returned non-zero");
+ tst_res(TFAIL,
+ "mapped memory region contains invalid data");
+ } else {
+ tst_res(TINFO, "memcmp returned zero");
+ tst_res(TPASS, "mmap() functionality is correct");
+ }
+ }
+
+#if defined(__ia64__) || defined(__hppa__) || defined(__mips__)
+ if (sig_flag > 0)
+ tst_res(TPASS, "Got SIGSEGV as expected");
+ else
+ tst_res(TFAIL,
+ "Mapped memory region with NO access is accessible");
+#elif defined(__x86_64__)
+ struct tst_kconfig_var kconfig =
+ TST_KCONFIG_INIT("CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS");
+ tst_kconfig_read(&kconfig, 1);
+ if (kconfig.choice == 'y') {
+ if (sig_flag > 0)
+ tst_res(TPASS, "Got SIGSEGV as expected");
+ else
+ tst_res(TFAIL,
+ "Mapped memory region with NO access is accessible");
+ }
+#else
+ if (sig_flag > 0)
+ tst_res(TFAIL, "Got unexpected SIGSEGV");
+#endif
+
+ /* Clean up things in case we are looping */
+ sig_flag = -1;
+ SAFE_MUNMAP(addr, page_sz);
}
static void cleanup(void)
{
- close(fildes);
free(dummy);
- tst_rmdir();
+ if (fildes > 0)
+ SAFE_CLOSE(fildes);
}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .cleanup = cleanup,
+};
--
2.47.1
More information about the ltp
mailing list