Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp2134306ybh; Fri, 17 Jul 2020 10:03:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZwokiIYgtP/NCPgkUoM4mKffprVQSHS3Y8oLhTDrmUaRaU/X5yXQVyS+stYWpFFcJbNsX X-Received: by 2002:a17:906:f298:: with SMTP id gu24mr9372817ejb.302.1595005436851; Fri, 17 Jul 2020 10:03:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595005436; cv=none; d=google.com; s=arc-20160816; b=Q2a03WaRuztNQ/8MjZjZjEhlX+58yePifl9/Mmel2rJsGVlpWBAm0/QZ1qMZ7yBDXn 1+Is83CBihdFRyJszt5o0fhhZT5kC+RVHOH57YSZBfAB6y9V4I76BWKYZZrj9ODftyqM sCxpx1ELY9xp+RrBiOrZICDgZeO04gb06i8NlOuAN9KyJR91m0fv7Dhtc+ZnYHBjM+lR 4XO4GY9LxsHkCNajy4DCA2BPpIFLA2LiQILRbj31CPcrvmeXM38Ne8jVldpo82jgEJJe YrUUWX6wkNusfPAi0avd1CQZDF2mwupgk0E+b6J+F3UGLMJA9wscfpeSIVX7jxZNQqH0 2YXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=VKQpUzjB+IPnCQVYlx84jOdPgy2i000ajSj86H371Mc=; b=s6ouzh0CqIqoefKf9oQHMycko77TYE9/MgGq8TPrujZCxg9PMadegP7pRyUFqJPjos /apZpSvYPMWeg8ncYwV6KoRUnl7JeW60kKVWfJZG5yOAv6FHlbUNC7jQwWm0lOEfoV06 xa1hQz8oocN7QoCy41w0A98UpAT86rsEBch1EiKmJnxKsH1Rqiv76J30QzBpPplaxRTt Tx1A6+hy50InOMKFRvRhQ0I/fFbeM/TP9dcyguueQkeAzZXMbYQnqAmuUDEDFpciruhw Gk9FL33GIvTyUGGEntr/JMssn8GqUHaTr0I2xDKp144Z0m3Ge2IvnRhgXyjJzECLdno8 1NIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w19si5526909eju.41.2020.07.17.10.03.33; Fri, 17 Jul 2020 10:03:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728022AbgGQRB0 (ORCPT + 99 others); Fri, 17 Jul 2020 13:01:26 -0400 Received: from mga04.intel.com ([192.55.52.120]:58926 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728010AbgGQRBV (ORCPT ); Fri, 17 Jul 2020 13:01:21 -0400 IronPort-SDR: 89PfmRH4RVk4fG/fExL3vy1+zTaPVQwJN7Cq11u5WDMlAICWRKB6CVxENA8OO8BXY4UHdTRiND EH+55yTKQygA== X-IronPort-AV: E=McAfee;i="6000,8403,9685"; a="147140862" X-IronPort-AV: E=Sophos;i="5.75,362,1589266800"; d="scan'208";a="147140862" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2020 10:01:19 -0700 IronPort-SDR: WAMcOAZNNxeoO/jWRTcKwIDAi/oBntr2VyGSCK7qxDVIsr7SEY63AmtN7v/zgFYsycubaRV5+S LAd4J/8jxJsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,362,1589266800"; d="scan'208";a="270862244" Received: from kcaccard-mobl.amr.corp.intel.com (HELO kcaccard-mobl1.jf.intel.com) ([10.212.33.149]) by fmsmga008.fm.intel.com with ESMTP; 17 Jul 2020 10:01:14 -0700 From: Kristen Carlson Accardi To: keescook@chromium.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, "H. Peter Anvin" , Jessica Yu Cc: arjan@linux.intel.com, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com, rick.p.edgecombe@intel.com, Kristen Carlson Accardi , Ard Biesheuvel , Tony Luck Subject: [PATCH v4 10/10] module: Reorder functions Date: Fri, 17 Jul 2020 10:00:07 -0700 Message-Id: <20200717170008.5949-11-kristen@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200717170008.5949-1-kristen@linux.intel.com> References: <20200717170008.5949-1-kristen@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce a new config option to allow modules to be re-ordered by function. This option can be enabled independently of the kernel text KASLR or FG_KASLR settings so that it can be used by architectures that do not support either of these features. This option will be selected by default if CONFIG_FG_KASLR is selected. If a module has functions split out into separate text sections (i.e. compiled with the -ffunction-sections flag), reorder the functions to provide some code diversification to modules. Signed-off-by: Kristen Carlson Accardi Reviewed-by: Kees Cook Acked-by: Ard Biesheuvel Tested-by: Ard Biesheuvel Reviewed-by: Tony Luck Tested-by: Tony Luck --- arch/x86/Makefile | 5 +++ init/Kconfig | 12 +++++++ kernel/kallsyms.c | 2 +- kernel/module.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 00e378de8bc0..0f2dbc46eb5c 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -51,6 +51,11 @@ ifdef CONFIG_X86_NEED_RELOCS LDFLAGS_vmlinux := --emit-relocs --discard-none endif +ifndef CONFIG_FG_KASLR + ifdef CONFIG_MODULE_FG_KASLR + KBUILD_CFLAGS_MODULE += -ffunction-sections + endif +endif # # Prevent GCC from generating any FP code by mistake. # diff --git a/init/Kconfig b/init/Kconfig index 82f042a1062f..b4741838da40 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1994,6 +1994,7 @@ config FG_KASLR bool "Function Granular Kernel Address Space Layout Randomization" depends on $(cc-option, -ffunction-sections) depends on ARCH_HAS_FG_KASLR + select MODULE_FG_KASLR default n help This option improves the randomness of the kernel text @@ -2278,6 +2279,17 @@ config UNUSED_KSYMS_WHITELIST one per line. The path can be absolute, or relative to the kernel source tree. +config MODULE_FG_KASLR + depends on $(cc-option, -ffunction-sections) + bool "Module Function Granular Layout Randomization" + help + This option randomizes the module text section by reordering the text + section by function at module load time. In order to use this + feature, the module must have been compiled with the + -ffunction-sections compiler flag. + + If unsure, say N. + endif # MODULES config MODULES_TREE_LOOKUP diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index 45d147f7f10e..e3f7d0fd3270 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c @@ -692,7 +692,7 @@ static int __kallsyms_open(struct inode *inode, struct file *file) * When function granular kaslr is enabled, we need to print out the symbols * at random so we don't reveal the new layout. */ -#if defined(CONFIG_FG_KASLR) +#if defined(CONFIG_FG_KASLR) || defined(CONFIG_MODULE_FG_KASLR) static int update_random_pos(struct kallsyms_shuffled_iter *s_iter, loff_t pos, loff_t *new_pos) { diff --git a/kernel/module.c b/kernel/module.c index aa183c9ac0a2..0f4f4e567a42 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -56,6 +56,7 @@ #include #include #include +#include #include #include "module-internal.h" @@ -2391,6 +2392,83 @@ static long get_offset(struct module *mod, unsigned int *size, return ret; } +/* + * shuffle_text_list() + * Use a Fisher Yates algorithm to shuffle a list of text sections. + */ +static void shuffle_text_list(Elf_Shdr **list, int size) +{ + int i; + unsigned int j; + Elf_Shdr *temp; + + for (i = size - 1; i > 0; i--) { + /* + * pick a random index from 0 to i + */ + get_random_bytes(&j, sizeof(j)); + j = j % (i + 1); + + temp = list[i]; + list[i] = list[j]; + list[j] = temp; + } +} + +/* + * randomize_text() + * Look through the core section looking for executable code sections. + * Store sections in an array and then shuffle the sections + * to reorder the functions. + */ +static void randomize_text(struct module *mod, struct load_info *info) +{ + int i; + int num_text_sections = 0; + Elf_Shdr **text_list; + int size = 0; + int max_sections = info->hdr->e_shnum; + unsigned int sec = find_sec(info, ".text"); + + if (sec == 0) + return; + + text_list = kmalloc_array(max_sections, sizeof(*text_list), GFP_KERNEL); + if (!text_list) + return; + + for (i = 0; i < max_sections; i++) { + Elf_Shdr *shdr = &info->sechdrs[i]; + const char *sname = info->secstrings + shdr->sh_name; + + if (!(shdr->sh_flags & SHF_ALLOC) || + !(shdr->sh_flags & SHF_EXECINSTR) || + strstarts(sname, ".init")) + continue; + + text_list[num_text_sections] = shdr; + num_text_sections++; + } + + shuffle_text_list(text_list, num_text_sections); + + for (i = 0; i < num_text_sections; i++) { + Elf_Shdr *shdr = text_list[i]; + + /* + * get_offset has a section index for it's last + * argument, that is only used by arch_mod_section_prepend(), + * which is only defined by parisc. Since this this type + * of randomization isn't supported on parisc, we can + * safely pass in zero as the last argument, as it is + * ignored. + */ + shdr->sh_entsize = get_offset(mod, &size, shdr, 0); + } + + kfree(text_list); +} + /* Lay out the SHF_ALLOC sections in a way not dissimilar to how ld might -- code, read-only data, read-write data, small data. Tally sizes, and place the offsets into sh_entsize fields: high bit means it @@ -2481,6 +2559,9 @@ static void layout_sections(struct module *mod, struct load_info *info) break; } } + + if (IS_ENABLED(CONFIG_MODULE_FG_KASLR)) + randomize_text(mod, info); } static void set_license(struct module *mod, const char *license) -- 2.20.1