summaryrefslogtreecommitdiff
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2023-12-23 15:52:13 +0100
committerIngo Molnar <mingo@kernel.org>2023-12-23 15:52:13 +0100
commitd2e9f53ac5dd76dadc0b5f04f6c27640604ce2af (patch)
treebf82d9fbfdc2ce67630fdacc18c2231f3d17876a /kernel/sys.c
parent418146e39891ef1fb2284dee4cabbfe616cd21cf (diff)
parentceb6a6f023fd3e8b07761ed900352ef574010bcb (diff)
downloadlwn-d2e9f53ac5dd76dadc0b5f04f6c27640604ce2af.tar.gz
lwn-d2e9f53ac5dd76dadc0b5f04f6c27640604ce2af.zip
Merge tag 'v6.7-rc6' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index 420d9cb9cc8e..e219fcfa112d 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2394,6 +2394,10 @@ static inline int prctl_set_mdwe(unsigned long bits, unsigned long arg3,
if (bits & PR_MDWE_NO_INHERIT && !(bits & PR_MDWE_REFUSE_EXEC_GAIN))
return -EINVAL;
+ /* PARISC cannot allow mdwe as it needs writable stacks */
+ if (IS_ENABLED(CONFIG_PARISC))
+ return -EINVAL;
+
current_bits = get_current_mdwe();
if (current_bits && current_bits != bits)
return -EPERM; /* Cannot unset the flags */