Re: [PATCH] s390: disable postinit-readonly for now

From: Heiko Carstens
Date: Thu Mar 17 2016 - 04:49:27 EST


On Wed, Mar 16, 2016 at 08:47:44PM +0100, Christian Borntraeger wrote:
> On 03/10/2016 06:31 PM, Kees Cook wrote:
> > This is a temporary fix to let lkdtm run again on s390, though it'll
> > still fail the ro_after_init tests. Until rodata and ro_after_init
> > sections can be split on s390, disable special handling of ro_after_init.
> >
> > Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
> > ---
> > for -next ...
>
> Given that the other patches are already merged in linus master via Ingo,
> do you want this to go via Ingo as well?

Let's route this via the s390 tree. I will add another patch to get rid of
the bogus "This architecture does not have kernel memory protection."
message printed to the console, just like parisc.

> > ---
> > arch/s390/include/asm/cache.h | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
> > index 4d7ccac5fd1d..22da3b34c655 100644
> > --- a/arch/s390/include/asm/cache.h
> > +++ b/arch/s390/include/asm/cache.h
> > @@ -15,4 +15,7 @@
> >
> > #define __read_mostly __attribute__((__section__(".data..read_mostly")))
> >
> > +/* Read-only memory is marked before mark_rodata_ro() is called. */
> > +#define __ro_after_init __read_mostly
> > +