From: Michal Clapinski <mclapinski@google.com>
To: Jeff Layton <jlayton@kernel.org>,
Chuck Lever <chuck.lever@oracle.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Shuah Khan <shuah@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Jeff Xu <jeffxu@google.com>, Aleksa Sarai <cyphar@cyphar.com>,
Daniel Verkamp <dverkamp@chromium.org>,
Kees Cook <keescook@chromium.org>,
Marc Dionne <marc.dionne@auristor.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org
Cc: Michal Clapinski <mclapinski@google.com>
Subject: [PATCH 2/2] selftests: test fcntl(F_CHECK_ORIGINAL_MEMFD)
Date: Thu, 31 Aug 2023 22:36:47 +0200 [thread overview]
Message-ID: <20230831203647.558079-3-mclapinski@google.com> (raw)
In-Reply-To: <20230831203647.558079-1-mclapinski@google.com>
Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
tools/testing/selftests/memfd/memfd_test.c | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/tools/testing/selftests/memfd/memfd_test.c b/tools/testing/selftests/memfd/memfd_test.c
index 3df008677239..4f3b7615ca87 100644
--- a/tools/testing/selftests/memfd/memfd_test.c
+++ b/tools/testing/selftests/memfd/memfd_test.c
@@ -39,6 +39,10 @@
#define MFD_NOEXEC_SEAL 0x0008U
+#ifndef F_CHECK_ORIGINAL_MEMFD
+#define F_CHECK_ORIGINAL_MEMFD (1024 + 15)
+#endif
+
/*
* Default is not to test hugetlbfs
*/
@@ -1567,6 +1571,32 @@ static void test_share_fork(char *banner, char *b_suffix)
close(fd);
}
+static void test_fcntl_check_original(void)
+{
+ int fd, fd2;
+ char path[128];
+
+ printf("%s FCNTL-CHECK-ORIGINAL\n", memfd_str);
+ fd = sys_memfd_create("kern_memfd_exec_reopen", 0);
+ if (fd < 0) {
+ printf("memfd_create failed: %m\n");
+ abort();
+ }
+ if (fcntl(fd, F_CHECK_ORIGINAL_MEMFD) != 1) {
+ printf("fcntl(F_CHECK_ORIGINAL_MEMFD) failed\n");
+ abort();
+ }
+
+ fd2 = mfd_assert_reopen_fd(fd);
+ if (fcntl(fd2, F_CHECK_ORIGINAL_MEMFD) != 0) {
+ printf("fcntl(F_CHECK_ORIGINAL_MEMFD) failed\n");
+ abort();
+ }
+
+ close(fd);
+ close(fd2);
+}
+
int main(int argc, char **argv)
{
pid_t pid;
@@ -1609,6 +1639,8 @@ int main(int argc, char **argv)
test_share_open("SHARE-OPEN", "");
test_share_fork("SHARE-FORK", "");
+ test_fcntl_check_original();
+
/* Run test-suite in a multi-threaded environment with a shared
* file-table. */
pid = spawn_idle_thread(CLONE_FILES | CLONE_FS | CLONE_VM);
--
2.42.0.283.g2d96d420d3-goog
prev parent reply other threads:[~2023-08-31 20:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-31 20:36 [PATCH 0/2] fcntl: add fcntl(F_CHECK_ORIGINAL_MEMFD) Michal Clapinski
2023-08-31 20:36 ` [PATCH 1/2] " Michal Clapinski
2023-09-01 12:56 ` Christian Brauner
2023-09-01 14:50 ` Michał Cłapiński
2023-09-01 18:34 ` Kees Cook
2023-09-04 7:29 ` Christian Brauner
2023-09-04 17:57 ` Michał Cłapiński
2023-09-05 8:37 ` Christian Brauner
2023-08-31 20:36 ` Michal Clapinski [this message]
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=20230831203647.558079-3-mclapinski@google.com \
--to=mclapinski@google.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=cyphar@cyphar.com \
--cc=dverkamp@chromium.org \
--cc=jeffxu@google.com \
--cc=jlayton@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=marc.dionne@auristor.com \
--cc=shuah@kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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: link
Be 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
Powered by JetHome