Merge pull request #287 from danh-arm/sb/bl2-loading-errors

Panic if platform specific BL3-0 handling fails v2

bl2/bl2_main.c

@@ -205,14 +205,16 @@ static int load_bl30(void)
 		       &bl30_image_info,
 		       NULL);
 
-	if (e == 0) {
+	if (e)
+		return e;
+
 #if TRUSTED_BOARD_BOOT
 	e = auth_verify_obj(AUTH_BL30_IMG,
 			bl30_image_info.image_base,
 			bl30_image_info.image_size);
 	if (e) {
 		ERROR("Failed to authenticate BL3-0 image.\n");
-			panic();
+		return e;
 	}
 
 	/* After working with data, invalidate the data cache */
@@ -221,7 +223,10 @@ static int load_bl30(void)
 #endif /* TRUSTED_BOARD_BOOT */
 
 	/* The subsequent handling of BL3-0 is platform specific */
-		bl2_plat_handle_bl30(&bl30_image_info);
+	e = bl2_plat_handle_bl30(&bl30_image_info);
+	if (e) {
+		ERROR("Failure in platform-specific handling of BL3-0 image.\n");
+		return e;
 	}
 #endif /* BL30_BASE */
 
@@ -256,15 +261,16 @@ static int load_bl31(bl31_params_t *bl2_to_bl31_params,
 		       BL31_BASE,
 		       bl2_to_bl31_params->bl31_image_info,
 		       bl31_ep_info);
+	if (e)
+		return e;
 
-	if (e == 0) {
 #if TRUSTED_BOARD_BOOT
 	e = auth_verify_obj(AUTH_BL31_IMG,
 			    bl2_to_bl31_params->bl31_image_info->image_base,
 			    bl2_to_bl31_params->bl31_image_info->image_size);
 	if (e) {
 		ERROR("Failed to authenticate BL3-1 image.\n");
-			panic();
+		return e;
 	}
 
 	/* After working with data, invalidate the data cache */
@@ -274,7 +280,6 @@ static int load_bl31(bl31_params_t *bl2_to_bl31_params,
 
 	bl2_plat_set_bl31_ep_info(bl2_to_bl31_params->bl31_image_info,
 				  bl31_ep_info);
-	}
 
 	return e;
 }
@@ -309,12 +314,14 @@ static int load_bl32(bl31_params_t *bl2_to_bl31_params)
 		       bl2_to_bl31_params->bl32_image_info,
 		       bl2_to_bl31_params->bl32_ep_info);
 
-	if (e == 0) {
+	if (e)
+		return e;
+
 #if TRUSTED_BOARD_BOOT
 	/* Image is present. Check if there is a valid certificate */
 	if (bl32_cert_error) {
 		ERROR("Failed to authenticate BL3-2 certificates.\n");
-			panic();
+		return bl32_cert_error;
 	}
 
 	e = auth_verify_obj(AUTH_BL32_IMG,
@@ -322,7 +329,7 @@ static int load_bl32(bl31_params_t *bl2_to_bl31_params)
 			    bl2_to_bl31_params->bl32_image_info->image_size);
 	if (e) {
 		ERROR("Failed to authenticate BL3-2 image.\n");
-			panic();
+		return e;
 	}
 	/* After working with data, invalidate the data cache */
 	inv_dcache_range(bl2_to_bl31_params->bl32_image_info->image_base,
@@ -332,7 +339,6 @@ static int load_bl32(bl31_params_t *bl2_to_bl31_params)
 	bl2_plat_set_bl32_ep_info(
 		bl2_to_bl31_params->bl32_image_info,
 		bl2_to_bl31_params->bl32_ep_info);
-	}
 #endif /* BL32_BASE */
 
 	return e;
@@ -361,14 +367,16 @@ static int load_bl33(bl31_params_t *bl2_to_bl31_params)
 		       bl2_to_bl31_params->bl33_image_info,
 		       bl2_to_bl31_params->bl33_ep_info);
 
-	if (e == 0) {
+	if (e)
+		return e;
+
 #if TRUSTED_BOARD_BOOT
 	e = auth_verify_obj(AUTH_BL33_IMG,
 			    bl2_to_bl31_params->bl33_image_info->image_base,
 			    bl2_to_bl31_params->bl33_image_info->image_size);
 	if (e) {
 		ERROR("Failed to authenticate BL3-3 image.\n");
-			panic();
+		return e;
 	}
 	/* After working with data, invalidate the data cache */
 	inv_dcache_range(bl2_to_bl31_params->bl33_image_info->image_base,
@@ -377,7 +385,6 @@ static int load_bl33(bl31_params_t *bl2_to_bl31_params)
 
 	bl2_plat_set_bl33_ep_info(bl2_to_bl31_params->bl33_image_info,
 				  bl2_to_bl31_params->bl33_ep_info);
-	}
 
 	return e;
 }