linux-kernel - [tip:x86/boot] x86/kconfig: Remove misleading note regarding hibernation and KASLR

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-5773ebfee729acf93b330664eab4c8d77edc2193@git.kernel.org>
Date:   Tue, 7 Feb 2017 01:43:58 -0800
From:   tip-bot for Niklas Cassel <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     linux-kernel@...r.kernel.org, peterz@...radead.org,
        keescook@...omium.org, torvalds@...ux-foundation.org,
        niklas.cassel@...s.com, tglx@...utronix.de, niklass@...s.com,
        hpa@...or.com, mingo@...nel.org
Subject: [tip:x86/boot] x86/kconfig: Remove misleading note regarding
 hibernation and KASLR

Commit-ID:  5773ebfee729acf93b330664eab4c8d77edc2193
Gitweb:     http://git.kernel.org/tip/5773ebfee729acf93b330664eab4c8d77edc2193
Author:     Niklas Cassel <niklas.cassel@...s.com>
AuthorDate: Mon, 6 Feb 2017 17:43:49 +0100
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 7 Feb 2017 10:39:58 +0100

x86/kconfig: Remove misleading note regarding hibernation and KASLR

There used to be a restriction with KASLR and hibernation, but this is no
longer true, and since commit:

  65fe935dd238 ("x86/KASLR, x86/power: Remove x86 hibernation restrictions")

the parameter "kaslr" does no longer exist.

Signed-off-by: Niklas Cassel <niklas.cassel@...s.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Niklas Cassel <niklass@...s.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/1486399429-23078-1-git-send-email-niklass@axis.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 arch/x86/Kconfig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e487493..4e6dbca 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1994,10 +1994,6 @@ config RANDOMIZE_BASE
 	  theoretically possible, but the implementations are further
 	  limited due to memory layouts.
 
-	  If CONFIG_HIBERNATE is also enabled, KASLR is disabled at boot
-	  time. To enable it, boot with "kaslr" on the kernel command
-	  line (which will also disable hibernation).
-
 	  If unsure, say N.
 
 # Relocation on x86 needs some additional build support