From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755618AbcCPTrv (ORCPT ); Wed, 16 Mar 2016 15:47:51 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:32800 "EHLO e06smtp14.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755190AbcCPTru (ORCPT ); Wed, 16 Mar 2016 15:47:50 -0400 X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: borntraeger@de.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-s390@vger.kernel.org Subject: Re: [PATCH] s390: disable postinit-readonly for now To: Kees Cook , Heiko Carstens References: <20160310173144.GA25532@www.outflux.net> Cc: Martin Schwidefsky , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kernel-hardening@lists.openwall.com, Ingo Molnar From: Christian Borntraeger Message-ID: <56E9B860.2060802@de.ibm.com> Date: Wed, 16 Mar 2016 20:47:44 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <20160310173144.GA25532@www.outflux.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16031619-0017-0000-0000-000007C49306 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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? > --- > 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 > + > #endif >