From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754102AbbCPMII (ORCPT ); Mon, 16 Mar 2015 08:08:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35963 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752080AbbCPMIG (ORCPT ); Mon, 16 Mar 2015 08:08:06 -0400 Date: Mon, 16 Mar 2015 05:07:51 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: vgoyal@redhat.com, akpm@linux-foundation.org, hpa@zytor.com, bp@suse.de, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: vgoyal@redhat.com, akpm@linux-foundation.org, hpa@zytor.com, bp@suse.de, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <1426251877-11415-1-git-send-email-bp@alien8.de> References: <1426251877-11415-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/build] x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text Git-Commit-ID: d8eb8940417559808fdd0180a4d50f8f0281b822 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d8eb8940417559808fdd0180a4d50f8f0281b822 Gitweb: http://git.kernel.org/tip/d8eb8940417559808fdd0180a4d50f8f0281b822 Author: Borislav Petkov AuthorDate: Fri, 13 Mar 2015 14:04:37 +0100 Committer: Ingo Molnar CommitDate: Fri, 13 Mar 2015 14:21:58 +0100 x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text Fix typos and also make it simpler without losing the gist of what it says. Signed-off-by: Borislav Petkov Cc: Andrew Morton Cc: H. Peter Anvin Cc: Thomas Gleixner Cc: Vivek Goyal Link: http://lkml.kernel.org/r/1426251877-11415-1-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/Kconfig | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 78a3f67..867bc5b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1742,14 +1742,11 @@ config KEXEC_VERIFY_SIG depends on KEXEC_FILE ---help--- This option makes kernel signature verification mandatory for - kexec_file_load() syscall. If kernel is signature can not be - verified, kexec_file_load() will fail. - - This option enforces signature verification at generic level. - One needs to enable signature verification for type of kernel - image being loaded to make sure it works. For example, enable - bzImage signature verification option to be able to load and - verify signatures of bzImage. Otherwise kernel loading will fail. + the kexec_file_load() syscall. + + In addition to that option, you need to enable signature + verification for the corresponding kernel image type being + loaded in order for this to work. config KEXEC_BZIMAGE_VERIFY_SIG bool "Enable bzImage signature verification support"