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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 C436DC7618B for ; Wed, 24 Jul 2019 15:02:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98571217D4 for ; Wed, 24 Jul 2019 15:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563980546; bh=uc0KLI43+qaPJJDJFF/rpo4gKsEd8bljVh/ZIiawjNA=; h=From:To:Cc:Subject:Date:List-ID:From; b=Q/dpojhy0a7UsyHUGQyUoePnH8XPdWbN9cH/9E71ziYq/tCpOXQMahVgM6nMhY1IA Bp5Wk9ZFmwb8V+PrAJ95zOzaphCNHMvZUJmbOQjvORRE7XXe71i4wuDGy5rQBx+LXO Xnhy7NpubG+fjmyh2fqb0Ye1LdTdqX855GGjoNiU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387564AbfGXPCZ (ORCPT ); Wed, 24 Jul 2019 11:02:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:48962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387479AbfGXPCY (ORCPT ); Wed, 24 Jul 2019 11:02:24 -0400 Received: from linux-8ccs.suse.de (ip5f5ade6a.dynamic.kabel-deutschland.de [95.90.222.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9289B2173E; Wed, 24 Jul 2019 15:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563980543; bh=uc0KLI43+qaPJJDJFF/rpo4gKsEd8bljVh/ZIiawjNA=; h=From:To:Cc:Subject:Date:From; b=qqIVutvKPwM9hGOWtAPH91Lb0nSEZKUv+tBHb/WMm3Yy0HE6YOf5d+xdKr1OW8YI5 uo+NEDsUCxyqm7gr4S5UX3tuuPBCHmR/Y5mJuCHH0/aT+9Xo42wCrqpiNPIywIGhOt XQUoWQ6efQtyk9yFoUF23rxgEz1Y+b3Nd28H/idI= From: Jessica Yu To: linux-kernel@vger.kernel.org Cc: Bartosz Golaszewski , Yang Yingliang , Jian Cheng , Nadav Amit , Sekhar Nori , Kevin Hilman , David Lechner , Adam Ford , Martin Kaiser , Jessica Yu Subject: [PATCH] modules: always page-align module section allocations Date: Wed, 24 Jul 2019 17:01:56 +0200 Message-Id: <20190724150156.28526-1-jeyu@kernel.org> X-Mailer: git-send-email 2.16.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some arches (e.g., arm64, x86) have moved towards non-executable module_alloc() allocations for security hardening reasons. That means that the module loader will need to set the text section of a module to executable, regardless of whether or not CONFIG_STRICT_MODULE_RWX is set. When CONFIG_STRICT_MODULE_RWX=y, module section allocations are always page-aligned to handle memory rwx permissions. On some arches with CONFIG_STRICT_MODULE_RWX=n however, when setting the module text to executable, the BUG_ON() in frob_text() gets triggered since module section allocations are not page-aligned when CONFIG_STRICT_MODULE_RWX=n. Since the set_memory_* API works with pages, and since we need to call set_memory_x() regardless of whether CONFIG_STRICT_MODULE_RWX is set, we might as well page-align all module section allocations for ease of managing rwx permissions of module sections (text, rodata, etc). Fixes: 2eef1399a866 ("modules: fix BUG when load module with rodata=n") Reported-by: Martin Kaiser Reported-by: Bartosz Golaszewski Tested-by: David Lechner Tested-by: Martin Kaiser Signed-off-by: Jessica Yu --- kernel/module.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 5933395af9a0..cd8df516666d 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -64,14 +64,9 @@ /* * Modules' sections will be aligned on page boundaries - * to ensure complete separation of code and data, but - * only when CONFIG_STRICT_MODULE_RWX=y + * to ensure complete separation of code and data */ -#ifdef CONFIG_STRICT_MODULE_RWX # define debug_align(X) ALIGN(X, PAGE_SIZE) -#else -# define debug_align(X) (X) -#endif /* If this is set, the section belongs in the init part of the module */ #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) -- 2.16.4