[PATCH master] ARM: psci: fix NULL pointer dereference on CPU idle

[PATCH master] ARM: psci: fix NULL pointer dereference on CPU idle

[Ahmad Fatoum]

We guard against cpu_off being NULL, but dereference cpu_suspend
instead.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
Cc: lst@pengutronix.de
Cc: jbe@pengutronix.de
Cc: jlu@pengutronix.de
---
 arch/arm/cpu/psci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/cpu/psci.c b/arch/arm/cpu/psci.c
index 436561f8649f..d1056e0659da 100644
--- a/arch/arm/cpu/psci.c
+++ b/arch/arm/cpu/psci.c
@@ -89,7 +89,7 @@ static unsigned long psci_cpu_suspend(u32 power_state, unsigned long entry,
 {
 	psci_printf("%s\n", __func__);
 
-	if (psci_ops->cpu_off)
+	if (psci_ops->cpu_suspend)
 		return psci_ops->cpu_suspend(power_state, entry, context_id);
 
 	return ARM_PSCI_RET_NOT_SUPPORTED;
-- 
2.28.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH master] ARM: psci: fix NULL pointer dereference on CPU idle

[Sascha Hauer]

On Wed, Sep 30, 2020 at 03:56:03PM +0200, Ahmad Fatoum wrote:
> We guard against cpu_off being NULL, but dereference cpu_suspend
> instead.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> Cc: lst@pengutronix.de
> Cc: jbe@pengutronix.de
> Cc: jlu@pengutronix.de
> ---
>  arch/arm/cpu/psci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/cpu/psci.c b/arch/arm/cpu/psci.c
> index 436561f8649f..d1056e0659da 100644
> --- a/arch/arm/cpu/psci.c
> +++ b/arch/arm/cpu/psci.c
> @@ -89,7 +89,7 @@ static unsigned long psci_cpu_suspend(u32 power_state, unsigned long entry,
>  {
>  	psci_printf("%s\n", __func__);
>  
> -	if (psci_ops->cpu_off)
> +	if (psci_ops->cpu_suspend)
>  		return psci_ops->cpu_suspend(power_state, entry, context_id);
>  
>  	return ARM_PSCI_RET_NOT_SUPPORTED;
> -- 
> 2.28.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox