From patchwork Fri Jan 31 06:17:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 11359359 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E7C70139A for ; Fri, 31 Jan 2020 06:17:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B44282253D for ; Fri, 31 Jan 2020 06:17:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZF3Abc/C" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B44282253D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3C18C6B059F; Fri, 31 Jan 2020 01:17:25 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3248D6B05A1; Fri, 31 Jan 2020 01:17:25 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E9A76B05A2; Fri, 31 Jan 2020 01:17:25 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0208.hostedemail.com [216.40.44.208]) by kanga.kvack.org (Postfix) with ESMTP id 05D826B059F for ; Fri, 31 Jan 2020 01:17:25 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id A2E478248D7C for ; Fri, 31 Jan 2020 06:17:24 +0000 (UTC) X-FDA: 76436922408.26.size00_40ace71d4fc26 X-Spam-Summary: 13,1.2,0,4a25d9efc6069fff,d41d8cd98f00b204,akpm@linux-foundation.org,:akpm@linux-foundation.org:benh@kernel.crashing.org:christophe.leroy@c-s.fr:keescook@chromium.org::mm-commits@vger.kernel.org:mpe@ellerman.id.au:paulus@samba.org:torvalds@linux-foundation.org,RULES_HIT:41:355:379:800:960:967:973:988:989:1260:1263:1345:1359:1381:1431:1437:1534:1541:1711:1730:1747:1777:1792:2393:2525:2559:2563:2682:2685:2859:2897:2902:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3352:3865:3866:3867:3871:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:5007:6261:6653:7576:7903:9025:9390:9545:10008:10913:11026:11257:11473:11658:11914:12043:12048:12297:12438:12517:12519:12555:12679:12783:12986:13069:13095:13255:13311:13357:13846:14093:14181:14384:14721:14849:21080:21212:21433:21451:21627:21939:21966:30054,0,RBL:error,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:1:0,LFtime:2 ,LUA_SUM X-HE-Tag: size00_40ace71d4fc26 X-Filterd-Recvd-Size: 2979 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Fri, 31 Jan 2020 06:17:24 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6DB3E2082E; Fri, 31 Jan 2020 06:17:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580451443; bh=7kNd286oMzQCOluOPcbwfGy7R/fdYz1Rchf/d/BfFOw=; h=Date:From:To:Subject:In-Reply-To:From; b=ZF3Abc/CZU6v03jfWiWFMpNFbVSvi957dnk6rudjH+1ThzMISznnqWieT6P53K50O 0f+EVkfCmZ/dCS4K7Hkqi+iz5YH0h7hxeGPvKIeu3NDsfe1F1TriCmueoUAPbBUhwl 2l6C3m7ObKs2Zc6Eyn9bZK9Xe4LWv67UYEcXseFs= Date: Thu, 30 Jan 2020 22:17:23 -0800 From: Andrew Morton To: akpm@linux-foundation.org, benh@kernel.crashing.org, christophe.leroy@c-s.fr, keescook@chromium.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, mpe@ellerman.id.au, paulus@samba.org, torvalds@linux-foundation.org Subject: [patch 114/118] init/main.c: fix misleading "This architecture does not have kernel memory protection" message Message-ID: <20200131061723.upjkoIjXq%akpm@linux-foundation.org> In-Reply-To: <20200130221021.5f0211c56346d5485af07923@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Christophe Leroy Subject: init/main.c: fix misleading "This architecture does not have kernel memory protection" message This message leads to thinking that memory protection is not implemented for the said architecture, whereas absence of CONFIG_STRICT_KERNEL_RWX only means that memory protection has not been selected at compile time. Don't print this message when CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is selected by the architecture. Instead, print "Kernel memory protection not selected by kernel config." Link: http://lkml.kernel.org/r/62477e446d9685459d4f27d193af6ff1bd69d55f.1578557581.git.christophe.leroy@c-s.fr Signed-off-by: Christophe Leroy Acked-by: Kees Cook Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Signed-off-by: Andrew Morton --- init/main.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/init/main.c~init-fix-misleading-this-architecture-does-not-have-kernel-memory-protection-message +++ a/init/main.c @@ -1104,6 +1104,11 @@ static void mark_readonly(void) } else pr_info("Kernel memory protection disabled.\n"); } +#elif defined(CONFIG_ARCH_HAS_STRICT_KERNEL_RWX) +static inline void mark_readonly(void) +{ + pr_warn("Kernel memory protection not selected by kernel config.\n"); +} #else static inline void mark_readonly(void) {