diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-17 16:27:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-17 16:27:02 +0300 |
| commit | b4645e814de433b501c7e83de709a6e08e83388e (patch) | |
| tree | 2b2f83b39462e435f834a87bc5a4e0360f55a517 /mm/secretmem.c | |
| parent | 243fdfb16a6a909e76cbd356a0368fdfd2109c53 (diff) | |
| parent | 17365d66f1c6aa6bf4f4cb9842f5edeac027bcfb (diff) | |
| download | linux-rolling-stable.tar.xz | |
Merge v6.11.4linux-rolling-stable
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/secretmem.c')
| -rw-r--r-- | mm/secretmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/secretmem.c b/mm/secretmem.c index 3afb5ad701e1..399552814fd0 100644 --- a/mm/secretmem.c +++ b/mm/secretmem.c @@ -238,7 +238,7 @@ SYSCALL_DEFINE1(memfd_secret, unsigned int, flags) /* make sure local flags do not confict with global fcntl.h */ BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC); - if (!secretmem_enable) + if (!secretmem_enable || !can_set_direct_map()) return -ENOSYS; if (flags & ~(SECRETMEM_FLAGS_MASK | O_CLOEXEC)) @@ -280,7 +280,7 @@ static struct file_system_type secretmem_fs = { static int __init secretmem_init(void) { - if (!secretmem_enable) + if (!secretmem_enable || !can_set_direct_map()) return 0; secretmem_mnt = kern_mount(&secretmem_fs); |