From patchwork Tue Jun 14 22:22:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emese Revfy X-Patchwork-Id: 9177051 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4612F60772 for ; Tue, 14 Jun 2016 22:15:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35DF226490 for ; Tue, 14 Jun 2016 22:15:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A48C28339; Tue, 14 Jun 2016 22:15:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B258926490 for ; Tue, 14 Jun 2016 22:15:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751560AbcFNWPw (ORCPT ); Tue, 14 Jun 2016 18:15:52 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36615 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752048AbcFNWPv (ORCPT ); Tue, 14 Jun 2016 18:15:51 -0400 Received: by mail-wm0-f65.google.com with SMTP id m124so1638287wme.3; Tue, 14 Jun 2016 15:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JjymZz2uhHCvPzmtlt3GvEBeElqLMEyz88V7qTna/FQ=; b=eYaCGXeFRVV/IGdMOfCK9mPdx5raEbazjKYrIPoes1T3PIImS4GRHQdwJ6Ikc+AW1t 7Rym9FQmoOjaHLlxvXGegIqLxDupbrlrTvohonMkueg86LkXYEePtqH9SHOWA/3SOmkz 7Gb1q+sO6gJA0//t/STVYeQskAZPAj93DiP0vgXZDNbszZ0IQoIAc7vIVwkOro+rgtNI +k/rcc7s1EyV+qtit6+wiXf/+Ug8405a7WjV5L2HqXDc+4gTyT2vuswcBF104rSfCBxk SnBkMw4F2UUfz/5ac3PFkhv+at3/l0GsPCxJHtT/K0xPNyIXuBmunWzMhZZBOtx+zp1L I3Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JjymZz2uhHCvPzmtlt3GvEBeElqLMEyz88V7qTna/FQ=; b=DNJ4BxJnQDVDYMhHpQ5kZREe/kkodsVgE05+hz0itzQwXgUm4Qnro43t3/13H42zxo WwywvLfiV/fW3Q/OCOz22A6G+O8VKTK4D8xC9c8rUuyDhC8Fu3c/dXnT0WVBvPXkc7iL f23KxKXeti+Nti4Zia+8hn2CQfcimw5BXBBjd7k8+VFoazNcD1FV5CFsk7O4J6/3IGwJ l5mnrXZEskPds3INDf2LEZ1Kd/tKmOwfcVsHpiIEALfQqLGmc1y0ByClaJQ+LsuaMyod iN+dg7fLYUBa0ImrY/d63J7RkAspaYmacOYpGF/v1xIFDGotNH3nHTG3mj3geBGO8ZC1 IGxQ== X-Gm-Message-State: ALyK8tKJI7EHpBGnilqR8W4J6TkSnvP+Q/OkdrjZGCiuMloGpZEso64E3g39DQJeTNyJ1A== X-Received: by 10.194.37.40 with SMTP id v8mr8021639wjj.161.1465942549457; Tue, 14 Jun 2016 15:15:49 -0700 (PDT) Received: from localhost (beleg.madhouse-project.org. [128.199.36.147]) by smtp.gmail.com with ESMTPSA id zc7sm35003744wjb.42.2016.06.14.15.15.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Jun 2016 15:15:48 -0700 (PDT) Date: Wed, 15 Jun 2016 00:22:37 +0200 From: Emese Revfy To: kernel-hardening@lists.openwall.com Cc: pageexec@freemail.hu, spender@grsecurity.net, mmarek@suse.com, keescook@chromium.org, linux-kernel@vger.kernel.org, yamada.masahiro@socionext.com, linux-kbuild@vger.kernel.org, tytso@mit.edu, akpm@linux-foundation.org, linux-mm@kvack.org, axboe@kernel.dk, viro@zeniv.linux.org.uk, paulmck@linux.vnet.ibm.com, mingo@redhat.com, tglx@linutronix.de, bart.vanassche@sandisk.com, davem@davemloft.net Subject: [PATCH v3 4/4] Add the extra_latent_entropy kernel parameter Message-Id: <20160615002237.87ab511f3ed4420923476c02@gmail.com> In-Reply-To: <20160615001754.f9e986cf961d1466f5e086dc@gmail.com> References: <20160615001754.f9e986cf961d1466f5e086dc@gmail.com> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.30; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When extra_latent_entropy is passed on the kernel command line, entropy will be extracted from up to the first 4GB of RAM while the runtime memory allocator is being initialized. Based on work created by the PaX Team. Signed-off-by: Emese Revfy --- Documentation/kernel-parameters.txt | 5 +++++ arch/Kconfig | 5 +++++ mm/page_alloc.c | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 5349363..6c2496e 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2862,6 +2862,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. + extra_latent_entropy + Enable a very simple form of latent entropy extraction + from the first 4GB of memory as the bootmem allocator + passes the memory pages to the buddy allocator. + pcbit= [HW,ISDN] pcd. [PARIDE] diff --git a/arch/Kconfig b/arch/Kconfig index c099ebd..8bf832e 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -405,6 +405,11 @@ config GCC_PLUGIN_LATENT_ENTROPY is some slowdown of the boot process (about 0.5%) and fork and irq processing. + When extra_latent_entropy is passed on the kernel command line, + entropy will be extracted from up to the first 4GB of RAM while the + runtime memory allocator is being initialized. This costs even more + slowdown of the boot process. + Note that entropy extracted this way is not known to be cryptographically secure! diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ffc4f4a..72c61bd 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -1234,6 +1235,15 @@ static void __free_pages_ok(struct page *page, unsigned int order) local_irq_restore(flags); } +bool __meminitdata extra_latent_entropy; + +static int __init setup_extra_latent_entropy(char *str) +{ + extra_latent_entropy = true; + return 0; +} +early_param("extra_latent_entropy", setup_extra_latent_entropy); + #ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY volatile u64 latent_entropy __latent_entropy; EXPORT_SYMBOL(latent_entropy); @@ -1254,6 +1264,21 @@ static void __init __free_pages_boot_core(struct page *page, unsigned int order) __ClearPageReserved(p); set_page_count(p, 0); + if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) { + u64 hash = 0; + size_t index, end = PAGE_SIZE * nr_pages / sizeof hash; + const u64 *data = lowmem_page_address(page); + + for (index = 0; index < end; index++) + hash ^= hash + data[index]; +#ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY + latent_entropy ^= hash; + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy)); +#else + add_device_randomness((const void *)&hash, sizeof(hash)); +#endif + } + page_zone(page)->managed_pages += nr_pages; set_page_refcounted(page); __free_pages(page, order);