lkml.org 
[lkml]   [2023]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: build failure after merge of the mm tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2023-03-27 00:36    [W:0.067 / U:1.420 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site