linux-next: build failure after merge of the mm tree

[Stephen Rothwell]

Hi all,

After merging the mm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

kernel/sys.c: In function '__do_sys_prctl':
kernel/sys.c:2664:9: error: duplicate case value
 2664 |         case PR_SET_HIDE_SELF_EXE:
      |         ^~~~
kernel/sys.c:2655:9: note: previously used here
 2655 |         case PR_SET_MDWE:
      |         ^~~~
kernel/sys.c:2669:9: error: duplicate case value
 2669 |         case PR_GET_HIDE_SELF_EXE:
      |         ^~~~
kernel/sys.c:2658:9: note: previously used here
 2658 |         case PR_GET_MDWE:
      |         ^~~~

Caused by commit

  ab30677b499c ("mm: implement memory-deny-write-execute as a prctl")

interacting with commit

  966eb1ba050d ("exec: add PR_HIDE_SELF_EXE prctl")

from the pidfd tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 30 Jan 2023 16:08:34 +1100
Subject: [PATCH] mm: fixup for "mm: implement memory-deny-write-execute as a prctl"

interacting with

  966eb1ba050d ("exec: add PR_HIDE_SELF_EXE prctl")

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/uapi/linux/prctl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h
index ccc92b92037c..99b5592cf297 100644
--- a/include/uapi/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
@@ -282,10 +282,10 @@ struct prctl_mm_map {
 # define PR_SME_VL_INHERIT		(1 << 17) /* inherit across exec */
 
 /* Memory deny write / execute */
-#define PR_SET_MDWE			65
+#define PR_SET_MDWE			67
 # define PR_MDWE_REFUSE_EXEC_GAIN	1
 
-#define PR_GET_MDWE			66
+#define PR_GET_MDWE			68
 
 #define PR_SET_VMA		0x53564d41
 # define PR_SET_VMA_ANON_NAME		0
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpaXTj3Uorr7.pgp
Description: OpenPGP digital signature