From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEE62C10F29 for ; Mon, 9 Mar 2020 12:21:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 962652072A for ; Mon, 9 Mar 2020 12:21:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SdBQy9qc"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="I9kaRzON"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="iMn0MJOk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 962652072A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kroah.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qAGFxTnynfNLAcDIVpQd98f8971+bBj5S0Ub4ZpIk+o=; b=SdBQy9qciSd8Ij 6IQx+YSlgTutB2skCYetHWo/bx6jgCydtZMm1iX018RdG27bNF+ZswTzODcmWsBxqPaAwI+7ctYPM LC7rRGIORzEhaVaZRx8lM4r75n8oDOVjNJ2KnUmP3gnHmF0JYe8War6iK6uAedTWwaDRbojf4iR7E oBVDhOXdy5ZkHfBqkeJ5POfuV3OsHb0qIWP4jINNL82MnL6HpEJfKCQ82QketsfqGn1s7Eq1t5c8Q PdXDUrH25L3Wp9X3JF6nPBh9Pch+tQ/RjGwhmlDi5mS2S3yWw2tfrd6k0sL6U3yFgRJuuKWLcwrbg H/nMYeXVKlIzd5Doaoug==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jBHPs-0002oZ-Of; Mon, 09 Mar 2020 12:21:52 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jBHPp-0002nn-Ax for linux-arm-kernel@lists.infradead.org; Mon, 09 Mar 2020 12:21:51 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 34D381365; Mon, 9 Mar 2020 08:21:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 09 Mar 2020 08:21:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=BCMBiPrCo1x258U10zWiv/x8MXq dMoavcniKhTrs81s=; b=I9kaRzON9+ykXOtdOV8S8BiZlkUcJtW5y0vuPwIagC6 xVJabMl5MsqwOM4J5EjYpagU7mmDAuJEu/Y53KG2XUrlQmCpeVCZbnfCQpxP3jeX tZuIuGF6XHPSCiscR7yXiKYS1UfvmY+afXTb5sRA1rHhQa10bqRyZEJk+Nv5Jw8y 9De7oc/VvumX8Of/kLJlsqqapH1bNfPRE7wstWPEzbjGfl4P36eByQVCFpvhKB0j 5FNyHhASwsC3YcXIZcd05Ec+8pmwpXmC/Iyd8kPGoO3FgYFwp4u1hBlhYk4cOV/Z o2cYsY+ROTfSHDRBdouud05Ap5MsQFWKHXInazxQZvg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=BCMBiP rCo1x258U10zWiv/x8MXqdMoavcniKhTrs81s=; b=iMn0MJOkt/FR2T+s/BWYrL blD06GQqZk4b43TttiV+/Nf7oa/xO6z/4Xcw1BXGp8m5oMlUmSAF82vXeV7VV28z SldpCEV9SMiWfQC35ROyMJAWEKfCU77iwOd2hPs3lmqkIzWCuHU0naYWAOSLLKwA GprlwDKOY8oyLEEv++J0oEzi978DvPAHU/ITRM9I8k8iQbZApDjKzSTUGKzTrDVM h5yogM6Q6nnxLlF460PIsg2DMjUuyjXd6T6qVuLjtR7QklX89u06QQEs3z5vFXaQ uUV5cpVKQ+Vk3UtLGKG5Ht86iJzZeqX/NOE0fddZ9R7utiz6H+fyD3iPzpMQu2qg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddukedggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucffohhmrghinhepghhithhhuhgsrd gtohhmnecukfhppeekfedrkeeirdekledruddtjeenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id E84833280059; Mon, 9 Mar 2020 08:21:42 -0400 (EDT) Date: Mon, 9 Mar 2020 13:21:38 +0100 From: Greg KH To: Phong Tran Subject: Re: [PATCH] arm64: add check_wx_pages debugfs for CHECK_WX Message-ID: <20200309122138.GA206943@kroah.com> References: <20200307093926.27145-1-tranmanphong@gmail.com> <20200309121713.GA26309@lakrids.cambridge.arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200309121713.GA26309@lakrids.cambridge.arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200309_052149_623221_A956B236 X-CRM114-Status: GOOD ( 21.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , keescook@chromium.org, steve.capper@arm.com, catalin.marinas@arm.com, kernel-hardening@lists.openwall.com, linux-kernel@vger.kernel.org, steven.price@arm.com, alexios.zavras@intel.com, broonie@kernel.org, tglx@linutronix.de, will@kernel.org, akpm@linux-foundation.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Mar 09, 2020 at 12:17:14PM +0000, Mark Rutland wrote: > On Sat, Mar 07, 2020 at 04:39:26PM +0700, Phong Tran wrote: > > follow the suggestion from > > https://github.com/KSPP/linux/issues/35 > > That says: > > | This should be implemented for all architectures > > ... so surely this should be in generic code, rahter than being > arm64-specific? > > Thanks, > Mark. > > > > > Signed-off-by: Phong Tran > > --- > > arch/arm64/Kconfig.debug | 3 ++- > > arch/arm64/include/asm/ptdump.h | 2 ++ > > arch/arm64/mm/dump.c | 1 + > > arch/arm64/mm/ptdump_debugfs.c | 18 ++++++++++++++++++ > > 4 files changed, 23 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug > > index 1c906d932d6b..be552fa351e2 100644 > > --- a/arch/arm64/Kconfig.debug > > +++ b/arch/arm64/Kconfig.debug > > @@ -48,7 +48,8 @@ config DEBUG_WX > > of other unfixed kernel bugs easier. > > > > There is no runtime or memory usage effect of this option > > - once the kernel has booted up - it's a one time check. > > + once the kernel has booted up - it's a one time check and > > + can be checked by echo "1" to "check_wx_pages" debugfs in runtime. > > > > If in doubt, say "Y". > > > > diff --git a/arch/arm64/include/asm/ptdump.h b/arch/arm64/include/asm/ptdump.h > > index 38187f74e089..b80d6b4fc508 100644 > > --- a/arch/arm64/include/asm/ptdump.h > > +++ b/arch/arm64/include/asm/ptdump.h > > @@ -24,9 +24,11 @@ struct ptdump_info { > > void ptdump_walk(struct seq_file *s, struct ptdump_info *info); > > #ifdef CONFIG_PTDUMP_DEBUGFS > > void ptdump_debugfs_register(struct ptdump_info *info, const char *name); > > +int ptdump_check_wx_init(void); > > #else > > static inline void ptdump_debugfs_register(struct ptdump_info *info, > > const char *name) { } > > +static inline int ptdump_check_wx_init(void) { return 0; } > > #endif > > void ptdump_check_wx(void); > > #endif /* CONFIG_PTDUMP_CORE */ > > diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c > > index 860c00ec8bd3..60c99a047763 100644 > > --- a/arch/arm64/mm/dump.c > > +++ b/arch/arm64/mm/dump.c > > @@ -378,6 +378,7 @@ static int ptdump_init(void) > > #endif > > ptdump_initialize(); > > ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables"); > > + ptdump_check_wx_init(); > > return 0; > > } > > device_initcall(ptdump_init); > > diff --git a/arch/arm64/mm/ptdump_debugfs.c b/arch/arm64/mm/ptdump_debugfs.c > > index 1f2eae3e988b..73cddc12c3c2 100644 > > --- a/arch/arm64/mm/ptdump_debugfs.c > > +++ b/arch/arm64/mm/ptdump_debugfs.c > > @@ -16,3 +16,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name) > > { > > debugfs_create_file(name, 0400, NULL, info, &ptdump_fops); > > } > > + > > +static int check_wx_debugfs_set(void *data, u64 val) > > +{ > > + if (val != 1ULL) > > + return -EINVAL; > > + > > + ptdump_check_wx(); > > + > > + return 0; > > +} > > + > > +DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n"); > > + > > +int ptdump_check_wx_init(void) > > +{ > > + return debugfs_create_file("check_wx_pages", 0200, NULL, > > + NULL, &check_wx_fops) ? 0 : -ENOMEM; Do not check the return value of this function, especially as it is returning a pointer, not an int! Just call the function and move on, you should not do anything different if it returns an error or not. thanks, greg k-h _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel