--- v12
+++ v10
@@ -66,18 +66,16 @@
here:
https://github.com/clipos-archive/clipos4_portage-overlay/search?q=O_MAYEXEC
+Co-developed-by: Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr>
+Signed-off-by: Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr>
+Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kees Cook <keescook@chromium.org>
-Co-developed-by: Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr>
-Signed-off-by: Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr>
-Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>
+Cc: Vincent Strubel <vincent.strubel@ssi.gouv.fr>
---
-
-Changes since v10:
-* Add enum definition to syscalls.h .
Changes since v9:
* Rename the syscall to trusted_for(2) and the sysctl to fs.trust_policy
@@ -181,10 +179,10 @@
Documentation/admin-guide/sysctl/fs.rst | 50 ++++++++++++++++
fs/open.c | 77 +++++++++++++++++++++++++
include/linux/fs.h | 1 +
- include/linux/syscalls.h | 2 +
+ include/linux/syscalls.h | 1 +
include/uapi/linux/trusted-for.h | 18 ++++++
kernel/sysctl.c | 12 +++-
- 6 files changed, 158 insertions(+), 2 deletions(-)
+ 6 files changed, 157 insertions(+), 2 deletions(-)
create mode 100644 include/uapi/linux/trusted-for.h
diff --git a/Documentation/admin-guide/sysctl/fs.rst b/Documentation/admin-guide/sysctl/fs.rst
@@ -348,7 +346,7 @@
{
struct path path;
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 8667d0cdc71e..197d089932d1 100644
+index 7519ae003a08..a9b25674b128 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -83,6 +83,7 @@ extern int sysctl_protected_symlinks;
@@ -360,18 +358,10 @@
typedef __kernel_rwf_t rwf_t;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
-index 37bea07c12f2..2f29e88d36b3 100644
+index 75ac7f8ae93c..55367f9670b1 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
-@@ -68,6 +68,7 @@ union bpf_attr;
- struct io_uring_params;
- struct clone_args;
- struct open_how;
-+enum trusted_for_usage;
-
- #include <linux/types.h>
- #include <linux/aio_abi.h>
-@@ -429,6 +430,7 @@ asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len);
+@@ -429,6 +429,7 @@ asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len);
asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode);
asmlinkage long sys_faccessat2(int dfd, const char __user *filename, int mode,
int flags);
@@ -448,5 +438,5 @@
{
.procname = "binfmt_misc",
--
-2.29.2
-
+2.28.0
+