From: linuxram at us.ibm.com (Ram Pai) Subject: [Linux-kselftest-mirror] [PATCH v10 20/24] selftests/vm: testcases must restore pkey-permissions Date: Mon, 22 Jan 2018 10:52:13 -0800 [thread overview] Message-ID: <1516647137-11174-21-git-send-email-linuxram@us.ibm.com> (raw) In-Reply-To: <1516647137-11174-1-git-send-email-linuxram@us.ibm.com> Generally the signal handler restores the state of the pkey register before returning. However there are times when the read/write operation can legitamely fail without invoking the signal handler. Eg: A sys_read() operaton to a write-protected page should be disallowed. In such a case the state of the pkey register is not restored to its original state. The test case is responsible for restoring the key register state to its original value. Signed-off-by: Ram Pai <linuxram at us.ibm.com> --- tools/testing/selftests/vm/protection_keys.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c index 3e9e36d..5783587 100644 --- a/tools/testing/selftests/vm/protection_keys.c +++ b/tools/testing/selftests/vm/protection_keys.c @@ -1003,6 +1003,7 @@ void test_read_of_write_disabled_region(int *ptr, u16 pkey) ptr_contents = read_ptr(ptr); dprintf1("*ptr: %d\n", ptr_contents); dprintf1("\n"); + pkey_write_allow(pkey); } void test_read_of_access_disabled_region(int *ptr, u16 pkey) { @@ -1082,6 +1083,7 @@ void test_kernel_write_of_access_disabled_region(int *ptr, u16 pkey) ret = read(test_fd, ptr, 1); dprintf1("read ret: %d\n", ret); pkey_assert(ret); + pkey_access_allow(pkey); } void test_kernel_write_of_write_disabled_region(int *ptr, u16 pkey) { @@ -1094,6 +1096,7 @@ void test_kernel_write_of_write_disabled_region(int *ptr, u16 pkey) if (ret < 0 && (DEBUG_LEVEL > 0)) perror("verbose read result (OK for this to be bad)"); pkey_assert(ret); + pkey_write_allow(pkey); } void test_kernel_gup_of_access_disabled_region(int *ptr, u16 pkey) @@ -1113,6 +1116,7 @@ void test_kernel_gup_of_access_disabled_region(int *ptr, u16 pkey) vmsplice_ret = vmsplice(pipe_fds[1], &iov, 1, SPLICE_F_GIFT); dprintf1("vmsplice() ret: %d\n", vmsplice_ret); pkey_assert(vmsplice_ret == -1); + pkey_access_allow(pkey); close(pipe_fds[0]); close(pipe_fds[1]); @@ -1133,6 +1137,7 @@ void test_kernel_gup_write_to_write_disabled_region(int *ptr, u16 pkey) if (DEBUG_LEVEL > 0) perror("futex"); dprintf1("futex() ret: %d\n", futex_ret); + pkey_write_allow(pkey); } /* Assumes that all pkeys other than 'pkey' are unallocated */ -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: linuxram@us.ibm.com (Ram Pai) Subject: [Linux-kselftest-mirror] [PATCH v10 20/24] selftests/vm: testcases must restore pkey-permissions Date: Mon, 22 Jan 2018 10:52:13 -0800 [thread overview] Message-ID: <1516647137-11174-21-git-send-email-linuxram@us.ibm.com> (raw) Message-ID: <20180122185213.Hihu4o5fXFU00qeinxd3E4rUlddsA8IRccYlXzCQ3R8@z> (raw) In-Reply-To: <1516647137-11174-1-git-send-email-linuxram@us.ibm.com> Generally the signal handler restores the state of the pkey register before returning. However there are times when the read/write operation can legitamely fail without invoking the signal handler. Eg: A sys_read() operaton to a write-protected page should be disallowed. In such a case the state of the pkey register is not restored to its original state. The test case is responsible for restoring the key register state to its original value. Signed-off-by: Ram Pai <linuxram at us.ibm.com> --- tools/testing/selftests/vm/protection_keys.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c index 3e9e36d..5783587 100644 --- a/tools/testing/selftests/vm/protection_keys.c +++ b/tools/testing/selftests/vm/protection_keys.c @@ -1003,6 +1003,7 @@ void test_read_of_write_disabled_region(int *ptr, u16 pkey) ptr_contents = read_ptr(ptr); dprintf1("*ptr: %d\n", ptr_contents); dprintf1("\n"); + pkey_write_allow(pkey); } void test_read_of_access_disabled_region(int *ptr, u16 pkey) { @@ -1082,6 +1083,7 @@ void test_kernel_write_of_access_disabled_region(int *ptr, u16 pkey) ret = read(test_fd, ptr, 1); dprintf1("read ret: %d\n", ret); pkey_assert(ret); + pkey_access_allow(pkey); } void test_kernel_write_of_write_disabled_region(int *ptr, u16 pkey) { @@ -1094,6 +1096,7 @@ void test_kernel_write_of_write_disabled_region(int *ptr, u16 pkey) if (ret < 0 && (DEBUG_LEVEL > 0)) perror("verbose read result (OK for this to be bad)"); pkey_assert(ret); + pkey_write_allow(pkey); } void test_kernel_gup_of_access_disabled_region(int *ptr, u16 pkey) @@ -1113,6 +1116,7 @@ void test_kernel_gup_of_access_disabled_region(int *ptr, u16 pkey) vmsplice_ret = vmsplice(pipe_fds[1], &iov, 1, SPLICE_F_GIFT); dprintf1("vmsplice() ret: %d\n", vmsplice_ret); pkey_assert(vmsplice_ret == -1); + pkey_access_allow(pkey); close(pipe_fds[0]); close(pipe_fds[1]); @@ -1133,6 +1137,7 @@ void test_kernel_gup_write_to_write_disabled_region(int *ptr, u16 pkey) if (DEBUG_LEVEL > 0) perror("futex"); dprintf1("futex() ret: %d\n", futex_ret); + pkey_write_allow(pkey); } /* Assumes that all pkeys other than 'pkey' are unallocated */ -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-01-22 18:52 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-22 18:51 [Linux-kselftest-mirror] [PATCH v10 00/24] selftests, powerpc, x86 : Memory Protection Keys linuxram 2018-01-22 18:51 ` Ram Pai 2018-01-22 18:51 ` [Linux-kselftest-mirror] [PATCH v10 01/24] selftests/x86: Move protecton key selftest to arch neutral directory linuxram 2018-01-22 18:51 ` Ram Pai 2018-01-22 18:51 ` [Linux-kselftest-mirror] [PATCH v10 02/24] selftests/vm: rename all references to pkru to a generic name linuxram 2018-01-22 18:51 ` Ram Pai 2018-01-22 18:51 ` [Linux-kselftest-mirror] [PATCH v10 03/24] selftests/vm: move generic definitions to header file linuxram 2018-01-22 18:51 ` Ram Pai 2018-01-22 18:51 ` [Linux-kselftest-mirror] [PATCH v10 04/24] selftests/vm: typecast the pkey register linuxram 2018-01-22 18:51 ` Ram Pai 2018-01-22 18:51 ` [Linux-kselftest-mirror] [PATCH v10 05/24] selftests/vm: generic function to handle shadow key register linuxram 2018-01-22 18:51 ` Ram Pai 2018-01-22 18:51 ` [Linux-kselftest-mirror] [PATCH v10 06/24] selftests/vm: fix the wrong assert in pkey_disable_set() linuxram 2018-01-22 18:51 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 07/24] selftests/vm: fixed bugs in pkey_disable_clear() linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 08/24] selftests/vm: clear the bits in shadow reg when a pkey is freed linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 09/24] selftests/vm: fix alloc_random_pkey() to make it really random linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 10/24] selftests/vm: introduce two arch independent abstraction linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 11/24] selftests/vm: pkey register should match shadow pkey linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 12/24] selftests/vm: generic cleanup linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 13/24] selftests/vm: powerpc implementation for generic abstraction linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 14/24] selftests/vm: clear the bits in shadow reg when a pkey is freed linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 15/24] selftests/vm: powerpc implementation to check support for pkey linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 16/24] selftests/vm: fix an assertion in test_pkey_alloc_exhaust() linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 17/24] selftests/vm: associate key on a mapped page and detect access violation linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 18/24] selftests/vm: associate key on a mapped page and detect write violation linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 19/24] selftests/vm: detect write violation on a mapped access-denied-key page linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` linuxram [this message] 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 20/24] selftests/vm: testcases must restore pkey-permissions Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 21/24] selftests/vm: sub-page allocator linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 22/24] selftests/vm: Fix deadlock in protection_keys.c linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 23/24] selftests/powerpc: Add ptrace tests for Protection Key register linuxram 2018-01-22 18:52 ` Ram Pai 2018-01-22 18:52 ` [Linux-kselftest-mirror] [PATCH v10 24/24] selftests/powerpc: Add core file test " linuxram 2018-01-22 18:52 ` Ram Pai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1516647137-11174-21-git-send-email-linuxram@us.ibm.com \ --to=linux-kselftest@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).