Skip to contentSkip to conversation

caam: Fix crash in case caam_jr_probe failed

PATCH New Gaurav Jain 2 participants 2 messages May 11, 2022 – May 20, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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.

---
 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
index 9fe1cd9048..0b3e3b2064 100644
@@ -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
index a71ee636af..253008a9c1 100644
@@ -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
index 0858ea5f05..936c8f865a 100644
@@ -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
index 8e23e6da32..66d6a21655 100644
@@ -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
index 2434bcfa98..67bd991989 100644
@@ -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
index dc9ac31eb0..c672be5d5d 100644
@@ -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
index 08bdc0c4af..217b7c4586 100644
@@ -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
index 16981de244..5fa4234fd0 100644
@@ -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
index 7eeec6c485..a2b95effad 100644
@@ -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
index 63f335be3b..4b9683dff9 100644
@@ -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
index 503a752ae9..36780ed520 100644
@@ -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
#1 lore raw

PATCH 1/1 caam: Fix crash in case caam_jr_probe failed

Quoted 6 lines

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.

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