summaryrefslogtreecommitdiff
path: root/include/linux/mman.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2024-04-01 10:08:18 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2024-04-01 10:08:18 +0200
commitb82779648dfd3814df4e381f086326ec70fd791f (patch)
tree59868a9860d907e232275d7a5a667e91213e6aa9 /include/linux/mman.h
parentfe19aab844ad76a4e001082f633b1ac34f2a943d (diff)
parent39cd87c4eb2b893354f3b850f916353f2658ae6f (diff)
Merge tag 'v6.9-rc2' into media_stage
Linux 6.9-rc2 This is needed to pull in commit 11763a8598f88 ("fs/9p: fix uaf in in v9fs_stat2inode_dotl"), which fixes the broken virtme. With this fix the media regression tests can be run again without crashing.
Diffstat (limited to 'include/linux/mman.h')
-rw-r--r--include/linux/mman.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/mman.h b/include/linux/mman.h
index dc7048824be8..bcb201ab7a41 100644
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -162,6 +162,14 @@ calc_vm_flag_bits(unsigned long flags)
unsigned long vm_commit_limit(void);
+#ifndef arch_memory_deny_write_exec_supported
+static inline bool arch_memory_deny_write_exec_supported(void)
+{
+ return true;
+}
+#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported
+#endif
+
/*
* Denies creating a writable executable mapping or gaining executable permissions.
*