[PATCH] x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text

[PATCH] x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text

[Borislav Petkov]

From: Borislav Petkov <bp@suse.de>

Make it much simpler without losing the gist of what it says.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
---
 arch/x86/Kconfig | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8f829ffb9003..8db84b0e5bbd 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1775,14 +1775,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"
-- 
2.2.0.33.gc18b867

Re: [PATCH] x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text

[Vivek Goyal]

On Fri, Mar 13, 2015 at 02:04:37PM +0100, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
> 
> Make it much simpler without losing the gist of what it says.
> 
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Vivek Goyal <vgoyal@redhat.com>
> ---
>  arch/x86/Kconfig | 13 +++++--------
>  1 file changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 8f829ffb9003..8db84b0e5bbd 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -1775,14 +1775,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.
>  

Hmm..., I find even previous text to be just fine. But as I wrote it, I
might be biased. So I will leave it to others to decide.

Thanks
Vivek

Re: [PATCH] x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text

[Borislav Petkov]

On Fri, Mar 13, 2015 at 09:13:24AM -0400, Vivek Goyal wrote:
> Hmm..., I find even previous text to be just fine.

I'm not saying the previous text was not fine - I just made it shorter
and faster to read, while retaining the information it conveys.

:)

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

[tip:x86/build] x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text

[tip-bot for Borislav Petkov]

Commit-ID:  d8eb8940417559808fdd0180a4d50f8f0281b822
Gitweb:     http://git.kernel.org/tip/d8eb8940417559808fdd0180a4d50f8f0281b822
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Fri, 13 Mar 2015 14:04:37 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
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 <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: http://lkml.kernel.org/r/1426251877-11415-1-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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"