1. Patchew
  2. linux
  3. View series

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

Stephen Rothwell posted 1 patch 2 years, 7 months ago
There is a newer version of this series
include/uapi/linux/prctl.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
linux-next: build failure after merge of the mm tree
Posted by Stephen Rothwell 2 years, 7 months ago 
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@canb.auug.org.au>
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@canb.auug.org.au>
---
 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
Re: linux-next: build failure after merge of the mm tree
Posted by Christian Brauner 2 years, 7 months ago 
On Mon, Jan 30, 2023 at 04:14:14PM +1100, Stephen Rothwell wrote:
> 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@canb.auug.org.au>
> 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@canb.auug.org.au>
> ---

Thanks Stephen,

I'm moving this out of -next for now until we've settled a few more
details.

Christian
Re: linux-next: build failure after merge of the mm tree
Posted by Stephen Rothwell 2 years, 6 months ago 
Hi Christian,

On Mon, 30 Jan 2023 09:09:56 +0100 Christian Brauner <brauner@kernel.org> wrote:
>
> On Mon, Jan 30, 2023 at 04:14:14PM +1100, Stephen Rothwell wrote:
> > 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@canb.auug.org.au>
> > 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@canb.auug.org.au>
> > ---  
> 
> 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

-- 
Cheers,
Stephen Rothwell
Re: linux-next: build failure after merge of the mm tree
Posted by Christian Brauner 2 years, 6 months ago 
On Mon, Feb 27, 2023 at 09:18:03AM +1100, Stephen Rothwell wrote:
> Hi Christian,
> 
> On Mon, 30 Jan 2023 09:09:56 +0100 Christian Brauner <brauner@kernel.org> wrote:
> >
> > On Mon, Jan 30, 2023 at 04:14:14PM +1100, Stephen Rothwell wrote:
> > > 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@canb.auug.org.au>
> > > 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@canb.auug.org.au>
> > > ---  
> > 
> > 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.

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.