caam: Fix crash in case caam_jr_probe failed
Subsystems (4)
PATCH 1/1 caam: Fix crash in case caam_jr_probe failed
From: Ye Li <[email protected]>
If probing caam_jr returns failure, the variable "dev" will not be initialized, so we can't use dev->name for the error print. Otherwise it will cause crash.
Signed-off-by Ye Li <[email protected]>
Reviewed-by Gaurav Jain <[email protected]>
--- arch/arm/cpu/armv7/ls102xa/cpu.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +- arch/arm/mach-imx/imx8/cpu.c | 2 +- arch/arm/mach-imx/imx8m/soc.c | 2 +- arch/arm/mach-imx/mx6/soc.c | 2 +- arch/arm/mach-imx/mx7/soc.c | 2 +- arch/arm/mach-imx/mx7ulp/soc.c | 2 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- board/freescale/imx8mm_evk/spl.c | 2 +- board/freescale/imx8mn_evk/spl.c | 2 +- board/freescale/imx8mp_evk/spl.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
arch/arm/cpu/armv7/ls102xa/cpu.c +1 -1
@@ -409,7 +409,7 @@ int arch_misc_init(void) ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }return 0 ;
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +1 -1
@@ -1648,7 +1648,7 @@ int arch_misc_init(void) ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }serdes_misc_init ();
arch/arm/mach-imx/imx8/cpu.c +1 -1
@@ -100,7 +100,7 @@ int arch_misc_init(void) ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }return 0 ;
arch/arm/mach-imx/imx8m/soc.c +1 -1
@@ -1410,7 +1410,7 @@ int arch_misc_init(void) ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }return 0 ;
arch/arm/mach-imx/mx6/soc.c +1 -1
@@ -744,7 +744,7 @@ int arch_misc_init(void) ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }setup_serial_number ();return 0 ;
arch/arm/mach-imx/mx7/soc.c +1 -1
@@ -361,7 +361,7 @@ int arch_misc_init(void)int ret; ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }return 0 ;
arch/arm/mach-imx/mx7ulp/soc.c +1 -1
@@ -93,7 +93,7 @@ int arch_misc_init(void) ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }return 0 ;
arch/powerpc/cpu/mpc85xx/cpu_init.c +1 -1
@@ -950,7 +950,7 @@ int arch_misc_init(void) ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }return 0 ;
board/freescale/imx8mm_evk/spl.c +1 -1
@@ -57,7 +57,7 @@ void spl_board_init(void) ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }puts ("Normal Boot\n" ); }
board/freescale/imx8mn_evk/spl.c +1 -1
@@ -52,7 +52,7 @@ void spl_board_init(void)if (IS_ENABLED (CONFIG_FSL_CAAM )) { ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }puts ("Normal Boot\n" );
board/freescale/imx8mp_evk/spl.c +1 -1
@@ -43,7 +43,7 @@ void spl_board_init(void) ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev);if (ret) -printf ("Failed to initialize %s: %d\n" , dev->name, ret); +printf ("Failed to initialize caam_jr: %d\n" , ret); }/* * Set GIC clock to 500Mhz for OD VDD_SOC. Kernel driver does
Signature · 1 line
2.25.1
PATCH 1/1 caam: Fix crash in case caam_jr_probe failed
Quoted 6 lines
From: Ye Li <[email protected]>
If probingcaam_jrreturns failure, the variable "dev" will not be initialized, so we can't usedev->namefor the error print. Otherwise it will cause crash.Signed-off-by Ye Li <[email protected]>Reviewed-by Gaurav Jain <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================