[PATCH master] lib: stackprotector: adjust Kconfig text for barebox

[PATCH master] lib: stackprotector: adjust Kconfig text for barebox

[Ahmad Fatoum]

The reference to kernel panic is taken from the original Linux Kconfig
help text. Leaving it as-is may be confusing, so adjust it for barebox.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 lib/Kconfig.hardening | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Kconfig.hardening b/lib/Kconfig.hardening
index f14b256a7d91..7f74d0d98a9c 100644
--- a/lib/Kconfig.hardening
+++ b/lib/Kconfig.hardening
@@ -30,7 +30,7 @@ config STACKPROTECTOR_STRONG
 	  the value just before actually returning.  Stack based buffer
 	  overflows (that need to overwrite this return address) now also
 	  overwrite the canary, which gets detected and the attack is then
-	  neutralized via a kernel panic.
+	  neutralized via a barebox panic.
 
 	  Functions will have the stack-protector canary logic added in any
 	  of the following conditions:
@@ -78,7 +78,7 @@ config PBL_STACKPROTECTOR_STRONG
 	  the value just before actually returning.  Stack based buffer
 	  overflows (that need to overwrite this return address) now also
 	  overwrite the canary, which gets detected and the attack is then
-	  neutralized via a kernel panic.
+	  neutralized via a barebox panic.
 
 	  Functions will have the stack-protector canary logic added in any
 	  of the following conditions:
-- 
2.39.2

Re: [PATCH master] lib: stackprotector: adjust Kconfig text for barebox

[Sascha Hauer]

On Wed, Jan 03, 2024 at 11:13:24AM +0100, Ahmad Fatoum wrote:
> The reference to kernel panic is taken from the original Linux Kconfig
> help text. Leaving it as-is may be confusing, so adjust it for barebox.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  lib/Kconfig.hardening | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/lib/Kconfig.hardening b/lib/Kconfig.hardening
> index f14b256a7d91..7f74d0d98a9c 100644
> --- a/lib/Kconfig.hardening
> +++ b/lib/Kconfig.hardening
> @@ -30,7 +30,7 @@ config STACKPROTECTOR_STRONG
>  	  the value just before actually returning.  Stack based buffer
>  	  overflows (that need to overwrite this return address) now also
>  	  overwrite the canary, which gets detected and the attack is then
> -	  neutralized via a kernel panic.
> +	  neutralized via a barebox panic.
>  
>  	  Functions will have the stack-protector canary logic added in any
>  	  of the following conditions:
> @@ -78,7 +78,7 @@ config PBL_STACKPROTECTOR_STRONG
>  	  the value just before actually returning.  Stack based buffer
>  	  overflows (that need to overwrite this return address) now also
>  	  overwrite the canary, which gets detected and the attack is then
> -	  neutralized via a kernel panic.
> +	  neutralized via a barebox panic.
>  
>  	  Functions will have the stack-protector canary logic added in any
>  	  of the following conditions:
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |