* [LTP] [PATCH v2] mprotect/mprotect04.c: add PROT_NONE, PROT_EXEC flag test
@ 2014-03-05 5:44 Xing Gu
2014-03-05 6:03 ` guxing
0 siblings, 1 reply; 4+ messages in thread
From: Xing Gu @ 2014-03-05 5:44 UTC (permalink / raw)
To: ltp-list
From: Gu Xing <gux.fnst@cn.fujitsu.com>
create a new case to test PROT_NONE, PROT_EXEC flag for mprotect(2)
Signed-off-by: Gu Xing <gux.fnst@cn.fujitsu.com>
---
runtest/ltplite | 1 +
runtest/stress.part3 | 1 +
runtest/syscalls | 1 +
testcases/kernel/syscalls/.gitignore | 1 +
testcases/kernel/syscalls/mprotect/mprotect04.c | 176 ++++++++++++++++++++++++
5 files changed, 180 insertions(+)
create mode 100644 testcases/kernel/syscalls/mprotect/mprotect04.c
diff --git a/runtest/ltplite b/runtest/ltplite
index c6d647d..a9686a0 100644
--- a/runtest/ltplite
+++ b/runtest/ltplite
@@ -463,6 +463,7 @@ modify_ldt02 modify_ldt02
mprotect01 mprotect01
mprotect02 mprotect02
mprotect03 mprotect03
+mprotect04 mprotect04
mremap01 mremap01
mremap02 mremap02
diff --git a/runtest/stress.part3 b/runtest/stress.part3
index b9b8d7a..6f521cf 100644
--- a/runtest/stress.part3
+++ b/runtest/stress.part3
@@ -386,6 +386,7 @@ modify_ldt02 modify_ldt02
mprotect01 mprotect01
mprotect02 mprotect02
mprotect03 mprotect03
+mprotect04 mprotect04
mremap01 mremap01
mremap02 mremap02
diff --git a/runtest/syscalls b/runtest/syscalls
index 13716d7..d803987 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -606,6 +606,7 @@ move_pages11 cd $LTPROOT/testcases/bin && chown root move_pages11 && chmod 04755
mprotect01 mprotect01
mprotect02 mprotect02
mprotect03 mprotect03
+mprotect04 mprotect04
mq_notify01 mq_notify01
mq_open01 mq_open01
diff --git a/testcases/kernel/syscalls/.gitignore b/testcases/kernel/syscalls/.gitignore
index 42b0eed..7642b11 100644
--- a/testcases/kernel/syscalls/.gitignore
+++ b/testcases/kernel/syscalls/.gitignore
@@ -550,6 +550,7 @@
/mprotect/mprotect01
/mprotect/mprotect02
/mprotect/mprotect03
+/mprotect/mprotect04
/mq_notify/mq_notify01
/mq_open/mq_open01
/mq_timedreceive/mq_timedreceive01
diff --git a/testcases/kernel/syscalls/mprotect/mprotect04.c b/testcases/kernel/syscalls/mprotect/mprotect04.c
new file mode 100644
index 0000000..3d4a600
--- /dev/null
+++ b/testcases/kernel/syscalls/mprotect/mprotect04.c
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2014 Fujitsu Ltd.
+ * Author: Gu Xing <gux.fnst@cn.fujitsu.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * Description:
+ * Verify that,
+ * 1) mprotect() succeeds to set a region of memory with no access,
+ * when 'prot' is set to PROT_NONE. An attempt to access the contents
+ * of the region gives rise to the signal SIGSEGV.
+ * 2) mprotect() succeeds to set a region of memory to be executed, when
+ * 'prot' is set to PROT_EXEC.
+ */
+
+#include <signal.h>
+#include <setjmp.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <bits/wordsize.h>
+#include <stdlib.h>
+
+#include "test.h"
+#include "usctest.h"
+#include "safe_macros.h"
+
+static void sighandler(int sig);
+
+static void setup(void);
+static void cleanup(void);
+
+static void testfunc_protnone(void);
+
+static void exec_func(void);
+static int (*func)(void);
+static void testfunc_protexec(void);
+
+static void (*testfunc[])(void) = { testfunc_protnone, testfunc_protexec };
+
+char *TCID = "mprotect04";
+int TST_TOTAL = ARRAY_SIZE(testfunc);
+
+static int sigsegv_caught;
+static sigjmp_buf env;
+
+int main(int ac, char **av)
+{
+ int lc;
+ int i;
+ char *msg;
+
+ msg = parse_opts(ac, av, NULL, NULL);
+ if (msg != NULL)
+ tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+
+ setup();
+
+ for (lc = 0; TEST_LOOPING(lc); lc++) {
+ tst_count = 0;
+
+ for (i = 0; i < TST_TOTAL; i++)
+ (*testfunc[i])();
+ }
+
+ cleanup();
+ tst_exit();
+}
+
+static void sighandler(int sig)
+{
+ if (sig == SIGSEGV) {
+ sigsegv_caught = 1;
+ siglongjmp(env, 1);
+ } else {
+ tst_brkm(TBROK, cleanup, "received an unexpected signal: %d",
+ sig);
+ }
+}
+
+static void setup(void)
+{
+ tst_sig(NOFORK, sighandler, cleanup);
+
+ TEST_PAUSE;
+
+ tst_tmpdir();
+}
+
+static void testfunc_protnone(void)
+{
+ char *addr;
+ int page_sz;
+
+ sigsegv_caught = 0;
+
+ page_sz = getpagesize();
+
+ addr = SAFE_MMAP(cleanup, 0, page_sz, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+ /* Change the protection to PROT_NONE. */
+ TEST(mprotect(addr, page_sz, PROT_NONE));
+
+ if (TEST_RETURN == -1) {
+ tst_resm(TFAIL | TTERRNO, "mprotect failed");
+ } else {
+ if (sigsetjmp(env, 1) == 0)
+ addr[0] = 1;
+
+ if (sigsegv_caught)
+ tst_resm(TPASS, "test PROT_NONE for mprotect success");
+ else
+ tst_resm(TFAIL, "test PROT_NONE for mprotect failed");
+ }
+
+ SAFE_MUNMAP(cleanup, addr, page_sz);
+}
+
+static void exec_func(void)
+{
+ return;
+}
+
+static void testfunc_protexec(void)
+{
+ int page_sz;
+
+ sigsegv_caught = 0;
+
+ page_sz = getpagesize();
+
+ func = SAFE_MMAP(cleanup, 0, page_sz, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+ bcopy(exec_func, func, page_sz);
+
+ /* Change the protection to PROT_EXEC. */
+ TEST(mprotect(func, page_sz, PROT_EXEC));
+
+ if (TEST_RETURN == -1) {
+ tst_resm(TFAIL | TTERRNO, "mprotect failed");
+ } else {
+ if (sigsetjmp(env, 1) == 0)
+ (*func)();
+
+ if (sigsegv_caught)
+ tst_resm(TFAIL, "test PROT_EXEC for mprotect failed");
+ else
+ tst_resm(TPASS, "test PROT_EXEC for mprotect success");
+ }
+
+ SAFE_MUNMAP(cleanup, func, page_sz);
+}
+
+static void cleanup(void)
+{
+ tst_rmdir();
+
+ TEST_CLEANUP;
+}
--
1.8.3.1
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [LTP] [PATCH v2] mprotect/mprotect04.c: add PROT_NONE, PROT_EXEC flag test
2014-03-05 5:44 [LTP] [PATCH v2] mprotect/mprotect04.c: add PROT_NONE, PROT_EXEC flag test Xing Gu
@ 2014-03-05 6:03 ` guxing
0 siblings, 0 replies; 4+ messages in thread
From: guxing @ 2014-03-05 6:03 UTC (permalink / raw)
To: ltp-list
Hi,
Please ignore this patch,thanks.
Regards,
Xing Gu
On 3/5/2014 1:44 PM, Xing Gu wrote:
> From: Gu Xing <gux.fnst@cn.fujitsu.com>
>
> create a new case to test PROT_NONE, PROT_EXEC flag for mprotect(2)
>
> Signed-off-by: Gu Xing <gux.fnst@cn.fujitsu.com>
> ---
> runtest/ltplite | 1 +
> runtest/stress.part3 | 1 +
> runtest/syscalls | 1 +
> testcases/kernel/syscalls/.gitignore | 1 +
> testcases/kernel/syscalls/mprotect/mprotect04.c | 176 ++++++++++++++++++++++++
> 5 files changed, 180 insertions(+)
> create mode 100644 testcases/kernel/syscalls/mprotect/mprotect04.c
>
> diff --git a/runtest/ltplite b/runtest/ltplite
> index c6d647d..a9686a0 100644
> --- a/runtest/ltplite
> +++ b/runtest/ltplite
> @@ -463,6 +463,7 @@ modify_ldt02 modify_ldt02
> mprotect01 mprotect01
> mprotect02 mprotect02
> mprotect03 mprotect03
> +mprotect04 mprotect04
>
> mremap01 mremap01
> mremap02 mremap02
> diff --git a/runtest/stress.part3 b/runtest/stress.part3
> index b9b8d7a..6f521cf 100644
> --- a/runtest/stress.part3
> +++ b/runtest/stress.part3
> @@ -386,6 +386,7 @@ modify_ldt02 modify_ldt02
> mprotect01 mprotect01
> mprotect02 mprotect02
> mprotect03 mprotect03
> +mprotect04 mprotect04
>
> mremap01 mremap01
> mremap02 mremap02
> diff --git a/runtest/syscalls b/runtest/syscalls
> index 13716d7..d803987 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -606,6 +606,7 @@ move_pages11 cd $LTPROOT/testcases/bin && chown root move_pages11 && chmod 04755
> mprotect01 mprotect01
> mprotect02 mprotect02
> mprotect03 mprotect03
> +mprotect04 mprotect04
>
> mq_notify01 mq_notify01
> mq_open01 mq_open01
> diff --git a/testcases/kernel/syscalls/.gitignore b/testcases/kernel/syscalls/.gitignore
> index 42b0eed..7642b11 100644
> --- a/testcases/kernel/syscalls/.gitignore
> +++ b/testcases/kernel/syscalls/.gitignore
> @@ -550,6 +550,7 @@
> /mprotect/mprotect01
> /mprotect/mprotect02
> /mprotect/mprotect03
> +/mprotect/mprotect04
> /mq_notify/mq_notify01
> /mq_open/mq_open01
> /mq_timedreceive/mq_timedreceive01
> diff --git a/testcases/kernel/syscalls/mprotect/mprotect04.c b/testcases/kernel/syscalls/mprotect/mprotect04.c
> new file mode 100644
> index 0000000..3d4a600
> --- /dev/null
> +++ b/testcases/kernel/syscalls/mprotect/mprotect04.c
> @@ -0,0 +1,176 @@
> +/*
> + * Copyright (c) 2014 Fujitsu Ltd.
> + * Author: Gu Xing <gux.fnst@cn.fujitsu.com>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of version 2 of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write the Free Software Foundation, Inc.,
> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> + */
> +/*
> + * Description:
> + * Verify that,
> + * 1) mprotect() succeeds to set a region of memory with no access,
> + * when 'prot' is set to PROT_NONE. An attempt to access the contents
> + * of the region gives rise to the signal SIGSEGV.
> + * 2) mprotect() succeeds to set a region of memory to be executed, when
> + * 'prot' is set to PROT_EXEC.
> + */
> +
> +#include <signal.h>
> +#include <setjmp.h>
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <fcntl.h>
> +#include <unistd.h>
> +#include <errno.h>
> +#include <string.h>
> +#include <sys/mman.h>
> +#include <bits/wordsize.h>
> +#include <stdlib.h>
> +
> +#include "test.h"
> +#include "usctest.h"
> +#include "safe_macros.h"
> +
> +static void sighandler(int sig);
> +
> +static void setup(void);
> +static void cleanup(void);
> +
> +static void testfunc_protnone(void);
> +
> +static void exec_func(void);
> +static int (*func)(void);
> +static void testfunc_protexec(void);
> +
> +static void (*testfunc[])(void) = { testfunc_protnone, testfunc_protexec };
> +
> +char *TCID = "mprotect04";
> +int TST_TOTAL = ARRAY_SIZE(testfunc);
> +
> +static int sigsegv_caught;
> +static sigjmp_buf env;
> +
> +int main(int ac, char **av)
> +{
> + int lc;
> + int i;
> + char *msg;
> +
> + msg = parse_opts(ac, av, NULL, NULL);
> + if (msg != NULL)
> + tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
> +
> + setup();
> +
> + for (lc = 0; TEST_LOOPING(lc); lc++) {
> + tst_count = 0;
> +
> + for (i = 0; i < TST_TOTAL; i++)
> + (*testfunc[i])();
> + }
> +
> + cleanup();
> + tst_exit();
> +}
> +
> +static void sighandler(int sig)
> +{
> + if (sig == SIGSEGV) {
> + sigsegv_caught = 1;
> + siglongjmp(env, 1);
> + } else {
> + tst_brkm(TBROK, cleanup, "received an unexpected signal: %d",
> + sig);
> + }
> +}
> +
> +static void setup(void)
> +{
> + tst_sig(NOFORK, sighandler, cleanup);
> +
> + TEST_PAUSE;
> +
> + tst_tmpdir();
> +}
> +
> +static void testfunc_protnone(void)
> +{
> + char *addr;
> + int page_sz;
> +
> + sigsegv_caught = 0;
> +
> + page_sz = getpagesize();
> +
> + addr = SAFE_MMAP(cleanup, 0, page_sz, PROT_READ | PROT_WRITE,
> + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
> +
> + /* Change the protection to PROT_NONE. */
> + TEST(mprotect(addr, page_sz, PROT_NONE));
> +
> + if (TEST_RETURN == -1) {
> + tst_resm(TFAIL | TTERRNO, "mprotect failed");
> + } else {
> + if (sigsetjmp(env, 1) == 0)
> + addr[0] = 1;
> +
> + if (sigsegv_caught)
> + tst_resm(TPASS, "test PROT_NONE for mprotect success");
> + else
> + tst_resm(TFAIL, "test PROT_NONE for mprotect failed");
> + }
> +
> + SAFE_MUNMAP(cleanup, addr, page_sz);
> +}
> +
> +static void exec_func(void)
> +{
> + return;
> +}
> +
> +static void testfunc_protexec(void)
> +{
> + int page_sz;
> +
> + sigsegv_caught = 0;
> +
> + page_sz = getpagesize();
> +
> + func = SAFE_MMAP(cleanup, 0, page_sz, PROT_READ | PROT_WRITE,
> + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
> +
> + bcopy(exec_func, func, page_sz);
> +
> + /* Change the protection to PROT_EXEC. */
> + TEST(mprotect(func, page_sz, PROT_EXEC));
> +
> + if (TEST_RETURN == -1) {
> + tst_resm(TFAIL | TTERRNO, "mprotect failed");
> + } else {
> + if (sigsetjmp(env, 1) == 0)
> + (*func)();
> +
> + if (sigsegv_caught)
> + tst_resm(TFAIL, "test PROT_EXEC for mprotect failed");
> + else
> + tst_resm(TPASS, "test PROT_EXEC for mprotect success");
> + }
> +
> + SAFE_MUNMAP(cleanup, func, page_sz);
> +}
> +
> +static void cleanup(void)
> +{
> + tst_rmdir();
> +
> + TEST_CLEANUP;
> +}
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [LTP] [PATCH v2] mprotect/mprotect04.c: add PROT_NONE, PROT_EXEC flag test
2014-03-05 6:56 Xing Gu
@ 2014-03-05 13:21 ` Jan Stancek
0 siblings, 0 replies; 4+ messages in thread
From: Jan Stancek @ 2014-03-05 13:21 UTC (permalink / raw)
To: Xing Gu; +Cc: ltp-list
----- Original Message -----
> From: "Xing Gu" <gux.fnst@cn.fujitsu.com>
> To: ltp-list@lists.sourceforge.net
> Sent: Wednesday, 5 March, 2014 7:56:19 AM
> Subject: [LTP] [PATCH v2] mprotect/mprotect04.c: add PROT_NONE, PROT_EXEC flag test
>
> create a new case to test PROT_NONE, PROT_EXEC flag for mprotect(2)
>
> Signed-off-by: Xing Gu <gux.fnst@cn.fujitsu.com>
Hi,
just some small nits:
- func doesn't need to be global
- tst_tmpdir and tst_rmdir can be removed, there is no file now
- bcopy is deprecated (marked as LEGACY in POSIX.1-2001)
Other than that it looks good to me.
Regards,
Jan
> ---
> runtest/ltplite | 1 +
> runtest/stress.part3 | 1 +
> runtest/syscalls | 1 +
> testcases/kernel/syscalls/.gitignore | 1 +
> testcases/kernel/syscalls/mprotect/mprotect04.c | 176
> ++++++++++++++++++++++++
> 5 files changed, 180 insertions(+)
> create mode 100644 testcases/kernel/syscalls/mprotect/mprotect04.c
>
> diff --git a/runtest/ltplite b/runtest/ltplite
> index c6d647d..a9686a0 100644
> --- a/runtest/ltplite
> +++ b/runtest/ltplite
> @@ -463,6 +463,7 @@ modify_ldt02 modify_ldt02
> mprotect01 mprotect01
> mprotect02 mprotect02
> mprotect03 mprotect03
> +mprotect04 mprotect04
>
> mremap01 mremap01
> mremap02 mremap02
> diff --git a/runtest/stress.part3 b/runtest/stress.part3
> index b9b8d7a..6f521cf 100644
> --- a/runtest/stress.part3
> +++ b/runtest/stress.part3
> @@ -386,6 +386,7 @@ modify_ldt02 modify_ldt02
> mprotect01 mprotect01
> mprotect02 mprotect02
> mprotect03 mprotect03
> +mprotect04 mprotect04
>
> mremap01 mremap01
> mremap02 mremap02
> diff --git a/runtest/syscalls b/runtest/syscalls
> index 13716d7..d803987 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -606,6 +606,7 @@ move_pages11 cd $LTPROOT/testcases/bin && chown root
> move_pages11 && chmod 04755
> mprotect01 mprotect01
> mprotect02 mprotect02
> mprotect03 mprotect03
> +mprotect04 mprotect04
>
> mq_notify01 mq_notify01
> mq_open01 mq_open01
> diff --git a/testcases/kernel/syscalls/.gitignore
> b/testcases/kernel/syscalls/.gitignore
> index 42b0eed..7642b11 100644
> --- a/testcases/kernel/syscalls/.gitignore
> +++ b/testcases/kernel/syscalls/.gitignore
> @@ -550,6 +550,7 @@
> /mprotect/mprotect01
> /mprotect/mprotect02
> /mprotect/mprotect03
> +/mprotect/mprotect04
> /mq_notify/mq_notify01
> /mq_open/mq_open01
> /mq_timedreceive/mq_timedreceive01
> diff --git a/testcases/kernel/syscalls/mprotect/mprotect04.c
> b/testcases/kernel/syscalls/mprotect/mprotect04.c
> new file mode 100644
> index 0000000..32f13e9
> --- /dev/null
> +++ b/testcases/kernel/syscalls/mprotect/mprotect04.c
> @@ -0,0 +1,176 @@
> +/*
> + * Copyright (c) 2014 Fujitsu Ltd.
> + * Author: Xing Gu <gux.fnst@cn.fujitsu.com>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of version 2 of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write the Free Software Foundation, Inc.,
> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> + */
> +/*
> + * Description:
> + * Verify that,
> + * 1) mprotect() succeeds to set a region of memory with no access,
> + * when 'prot' is set to PROT_NONE. An attempt to access the contents
> + * of the region gives rise to the signal SIGSEGV.
> + * 2) mprotect() succeeds to set a region of memory to be executed, when
> + * 'prot' is set to PROT_EXEC.
> + */
> +
> +#include <signal.h>
> +#include <setjmp.h>
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <fcntl.h>
> +#include <unistd.h>
> +#include <errno.h>
> +#include <string.h>
> +#include <sys/mman.h>
> +#include <bits/wordsize.h>
> +#include <stdlib.h>
> +
> +#include "test.h"
> +#include "usctest.h"
> +#include "safe_macros.h"
> +
> +static void sighandler(int sig);
> +
> +static void setup(void);
> +static void cleanup(void);
> +
> +static void testfunc_protnone(void);
> +
> +static void exec_func(void);
> +static int (*func)(void);
> +static void testfunc_protexec(void);
> +
> +static void (*testfunc[])(void) = { testfunc_protnone, testfunc_protexec };
> +
> +char *TCID = "mprotect04";
> +int TST_TOTAL = ARRAY_SIZE(testfunc);
> +
> +static volatile int sigsegv_caught;
> +static sigjmp_buf env;
> +
> +int main(int ac, char **av)
> +{
> + int lc;
> + int i;
> + char *msg;
> +
> + msg = parse_opts(ac, av, NULL, NULL);
> + if (msg != NULL)
> + tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
> +
> + setup();
> +
> + for (lc = 0; TEST_LOOPING(lc); lc++) {
> + tst_count = 0;
> +
> + for (i = 0; i < TST_TOTAL; i++)
> + (*testfunc[i])();
> + }
> +
> + cleanup();
> + tst_exit();
> +}
> +
> +static void sighandler(int sig)
> +{
> + if (sig == SIGSEGV) {
> + sigsegv_caught = 1;
> + siglongjmp(env, 1);
> + } else {
> + tst_brkm(TBROK, cleanup, "received an unexpected signal: %d",
> + sig);
> + }
> +}
> +
> +static void setup(void)
> +{
> + tst_sig(NOFORK, sighandler, cleanup);
> +
> + TEST_PAUSE;
> +
> + tst_tmpdir();
> +}
> +
> +static void testfunc_protnone(void)
> +{
> + char *addr;
> + int page_sz;
> +
> + sigsegv_caught = 0;
> +
> + page_sz = getpagesize();
> +
> + addr = SAFE_MMAP(cleanup, 0, page_sz, PROT_READ | PROT_WRITE,
> + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
> +
> + /* Change the protection to PROT_NONE. */
> + TEST(mprotect(addr, page_sz, PROT_NONE));
> +
> + if (TEST_RETURN == -1) {
> + tst_resm(TFAIL | TTERRNO, "mprotect failed");
> + } else {
> + if (sigsetjmp(env, 1) == 0)
> + addr[0] = 1;
> +
> + if (sigsegv_caught)
> + tst_resm(TPASS, "test PROT_NONE for mprotect success");
> + else
> + tst_resm(TFAIL, "test PROT_NONE for mprotect failed");
> + }
> +
> + SAFE_MUNMAP(cleanup, addr, page_sz);
> +}
> +
> +static void exec_func(void)
> +{
> + return;
> +}
> +
> +static void testfunc_protexec(void)
> +{
> + int page_sz;
> +
> + sigsegv_caught = 0;
> +
> + page_sz = getpagesize();
> +
> + func = SAFE_MMAP(cleanup, 0, page_sz, PROT_READ | PROT_WRITE,
> + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
> +
> + bcopy(exec_func, func, page_sz);
> +
> + /* Change the protection to PROT_EXEC. */
> + TEST(mprotect(func, page_sz, PROT_EXEC));
> +
> + if (TEST_RETURN == -1) {
> + tst_resm(TFAIL | TTERRNO, "mprotect failed");
> + } else {
> + if (sigsetjmp(env, 1) == 0)
> + (*func)();
> +
> + if (sigsegv_caught)
> + tst_resm(TFAIL, "test PROT_EXEC for mprotect failed");
> + else
> + tst_resm(TPASS, "test PROT_EXEC for mprotect success");
> + }
> +
> + SAFE_MUNMAP(cleanup, func, page_sz);
> +}
> +
> +static void cleanup(void)
> +{
> + tst_rmdir();
> +
> + TEST_CLEANUP;
> +}
> --
> 1.8.3.1
>
>
> ------------------------------------------------------------------------------
> Subversion Kills Productivity. Get off Subversion & Make the Move to
> Perforce.
> With Perforce, you get hassle-free workflows. Merge that actually works.
> Faster operations. Version large binaries. Built-in WAN optimization and the
> freedom to use Git, Perforce or both. Make the move to Perforce.
> http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
> _______________________________________________
> Ltp-list mailing list
> Ltp-list@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ltp-list
>
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 4+ messages in thread
* [LTP] [PATCH v2] mprotect/mprotect04.c: add PROT_NONE, PROT_EXEC flag test
@ 2014-03-05 6:56 Xing Gu
2014-03-05 13:21 ` Jan Stancek
0 siblings, 1 reply; 4+ messages in thread
From: Xing Gu @ 2014-03-05 6:56 UTC (permalink / raw)
To: ltp-list
create a new case to test PROT_NONE, PROT_EXEC flag for mprotect(2)
Signed-off-by: Xing Gu <gux.fnst@cn.fujitsu.com>
---
runtest/ltplite | 1 +
runtest/stress.part3 | 1 +
runtest/syscalls | 1 +
testcases/kernel/syscalls/.gitignore | 1 +
testcases/kernel/syscalls/mprotect/mprotect04.c | 176 ++++++++++++++++++++++++
5 files changed, 180 insertions(+)
create mode 100644 testcases/kernel/syscalls/mprotect/mprotect04.c
diff --git a/runtest/ltplite b/runtest/ltplite
index c6d647d..a9686a0 100644
--- a/runtest/ltplite
+++ b/runtest/ltplite
@@ -463,6 +463,7 @@ modify_ldt02 modify_ldt02
mprotect01 mprotect01
mprotect02 mprotect02
mprotect03 mprotect03
+mprotect04 mprotect04
mremap01 mremap01
mremap02 mremap02
diff --git a/runtest/stress.part3 b/runtest/stress.part3
index b9b8d7a..6f521cf 100644
--- a/runtest/stress.part3
+++ b/runtest/stress.part3
@@ -386,6 +386,7 @@ modify_ldt02 modify_ldt02
mprotect01 mprotect01
mprotect02 mprotect02
mprotect03 mprotect03
+mprotect04 mprotect04
mremap01 mremap01
mremap02 mremap02
diff --git a/runtest/syscalls b/runtest/syscalls
index 13716d7..d803987 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -606,6 +606,7 @@ move_pages11 cd $LTPROOT/testcases/bin && chown root move_pages11 && chmod 04755
mprotect01 mprotect01
mprotect02 mprotect02
mprotect03 mprotect03
+mprotect04 mprotect04
mq_notify01 mq_notify01
mq_open01 mq_open01
diff --git a/testcases/kernel/syscalls/.gitignore b/testcases/kernel/syscalls/.gitignore
index 42b0eed..7642b11 100644
--- a/testcases/kernel/syscalls/.gitignore
+++ b/testcases/kernel/syscalls/.gitignore
@@ -550,6 +550,7 @@
/mprotect/mprotect01
/mprotect/mprotect02
/mprotect/mprotect03
+/mprotect/mprotect04
/mq_notify/mq_notify01
/mq_open/mq_open01
/mq_timedreceive/mq_timedreceive01
diff --git a/testcases/kernel/syscalls/mprotect/mprotect04.c b/testcases/kernel/syscalls/mprotect/mprotect04.c
new file mode 100644
index 0000000..32f13e9
--- /dev/null
+++ b/testcases/kernel/syscalls/mprotect/mprotect04.c
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2014 Fujitsu Ltd.
+ * Author: Xing Gu <gux.fnst@cn.fujitsu.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * Description:
+ * Verify that,
+ * 1) mprotect() succeeds to set a region of memory with no access,
+ * when 'prot' is set to PROT_NONE. An attempt to access the contents
+ * of the region gives rise to the signal SIGSEGV.
+ * 2) mprotect() succeeds to set a region of memory to be executed, when
+ * 'prot' is set to PROT_EXEC.
+ */
+
+#include <signal.h>
+#include <setjmp.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <bits/wordsize.h>
+#include <stdlib.h>
+
+#include "test.h"
+#include "usctest.h"
+#include "safe_macros.h"
+
+static void sighandler(int sig);
+
+static void setup(void);
+static void cleanup(void);
+
+static void testfunc_protnone(void);
+
+static void exec_func(void);
+static int (*func)(void);
+static void testfunc_protexec(void);
+
+static void (*testfunc[])(void) = { testfunc_protnone, testfunc_protexec };
+
+char *TCID = "mprotect04";
+int TST_TOTAL = ARRAY_SIZE(testfunc);
+
+static volatile int sigsegv_caught;
+static sigjmp_buf env;
+
+int main(int ac, char **av)
+{
+ int lc;
+ int i;
+ char *msg;
+
+ msg = parse_opts(ac, av, NULL, NULL);
+ if (msg != NULL)
+ tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+
+ setup();
+
+ for (lc = 0; TEST_LOOPING(lc); lc++) {
+ tst_count = 0;
+
+ for (i = 0; i < TST_TOTAL; i++)
+ (*testfunc[i])();
+ }
+
+ cleanup();
+ tst_exit();
+}
+
+static void sighandler(int sig)
+{
+ if (sig == SIGSEGV) {
+ sigsegv_caught = 1;
+ siglongjmp(env, 1);
+ } else {
+ tst_brkm(TBROK, cleanup, "received an unexpected signal: %d",
+ sig);
+ }
+}
+
+static void setup(void)
+{
+ tst_sig(NOFORK, sighandler, cleanup);
+
+ TEST_PAUSE;
+
+ tst_tmpdir();
+}
+
+static void testfunc_protnone(void)
+{
+ char *addr;
+ int page_sz;
+
+ sigsegv_caught = 0;
+
+ page_sz = getpagesize();
+
+ addr = SAFE_MMAP(cleanup, 0, page_sz, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+ /* Change the protection to PROT_NONE. */
+ TEST(mprotect(addr, page_sz, PROT_NONE));
+
+ if (TEST_RETURN == -1) {
+ tst_resm(TFAIL | TTERRNO, "mprotect failed");
+ } else {
+ if (sigsetjmp(env, 1) == 0)
+ addr[0] = 1;
+
+ if (sigsegv_caught)
+ tst_resm(TPASS, "test PROT_NONE for mprotect success");
+ else
+ tst_resm(TFAIL, "test PROT_NONE for mprotect failed");
+ }
+
+ SAFE_MUNMAP(cleanup, addr, page_sz);
+}
+
+static void exec_func(void)
+{
+ return;
+}
+
+static void testfunc_protexec(void)
+{
+ int page_sz;
+
+ sigsegv_caught = 0;
+
+ page_sz = getpagesize();
+
+ func = SAFE_MMAP(cleanup, 0, page_sz, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+ bcopy(exec_func, func, page_sz);
+
+ /* Change the protection to PROT_EXEC. */
+ TEST(mprotect(func, page_sz, PROT_EXEC));
+
+ if (TEST_RETURN == -1) {
+ tst_resm(TFAIL | TTERRNO, "mprotect failed");
+ } else {
+ if (sigsetjmp(env, 1) == 0)
+ (*func)();
+
+ if (sigsegv_caught)
+ tst_resm(TFAIL, "test PROT_EXEC for mprotect failed");
+ else
+ tst_resm(TPASS, "test PROT_EXEC for mprotect success");
+ }
+
+ SAFE_MUNMAP(cleanup, func, page_sz);
+}
+
+static void cleanup(void)
+{
+ tst_rmdir();
+
+ TEST_CLEANUP;
+}
--
1.8.3.1
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-05 13:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-05 5:44 [LTP] [PATCH v2] mprotect/mprotect04.c: add PROT_NONE, PROT_EXEC flag test Xing Gu
2014-03-05 6:03 ` guxing
2014-03-05 6:56 Xing Gu
2014-03-05 13:21 ` Jan Stancek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.