linux-next: build failure after merge of the mm tree
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 <[email protected]>
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")
--- include/uapi/linux/prctl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/prctl.h +2 -2
@@ -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
Signature · 5 lines
2.35.1 -- Cheers, Stephen Rothwell
Quoted 35 lines · 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 value2664 | 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: addPR_HIDE_SELF_EXEprctl")from the pidfd tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <[email protected]>
Date: Mon, 30 Jan 2023 16:08:34 +1100
Subject: [PATCH] mm: fixup for "mm: implement memory-deny-write-execute as a prctl"
Quoted 6 lines
interacting with
966eb1ba050d("exec: addPR_HIDE_SELF_EXEprctl")Signed-off-by Stephen Rothwell <[email protected]>---
Thanks Stephen,
I'm moving this out of -next for now until we've settled a few more details.
Christian
Hi Christian,
Quoted 41 lines · On Mon, 30 Jan 2023 09:09:56 +0100 Christian Brauner <[email protected]> wrote:
Quoted 39 lines · 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 value2664 | 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: addPR_HIDE_SELF_EXEprctl")from the pidfd tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <[email protected]>
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: addPR_HIDE_SELF_EXEprctl")
Quoted 7 lines
Quoted 2 lines
Signed-off-by Stephen Rothwell <[email protected]>---
Thanks Stephen,
I'm moving this out of -next for now until we've settled a few more details.
I am still applying this to the merge of the pidfd tree. Also I noticed that a similar fixup will need to be applied to tools/testing/selftests/prctl/hide-self-exe.c
Signature · 2 lines
Cheers, Stephen Rothwell
Quoted 47 lines · Stephen Rothwell
Hi Christian,
Quoted 44 lines · On Mon, 30 Jan 2023 09:09:56 +0100 Christian Brauner <[email protected]> wrote:
Quoted 41 lines · 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 value2664 | 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: addPR_HIDE_SELF_EXEprctl")from the pidfd tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <[email protected]>
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: addPR_HIDE_SELF_EXEprctl")Signed-off-by Stephen Rothwell <[email protected]>---
Quoted 8 lines
Quoted 4 lines
Thanks Stephen,
I'm moving this out of -next for now until we've settled a few more details.
I am still applying this to the merge of the pidfd tree. Also I noticed that a similar fixup will need to be applied to
tools/testing/selftests/prctl/hide-self-exe.c
Sorry Stephen, I forgot to drop the patches from this branch. I dropped them now. Let me know if you still see issues.