commit c2ebdddb7d7b2d8c02b178ef1f7f6359bcac0c4c
author Ed Tanous <ed@tanous.net> Sun Mar 09 10:07:01 2025 -0700
committer Ed Tanous <ed@tanous.net> Tue Mar 18 22:55:13 2025 +0000
tree ed963aaf81db85b58d7725cf2760047ac800378a
parent badae112389c19b2476437b69432463dfbb670c9

Fix up guid

GUIDs have some cases where they might not be representable as a string,
due to an overflow.  To handle this previously, the existing
implementation just allocated extra space.

To ensure that we are always publishing correct guids, break this
function down into an add_guid method that we can call anytime we add a
guid to json.  This function can use the appropriate guid string length,
and if we go over, we can make sure that we don't publish the string at
all, by handling the appropriate error codes.

Change-Id: I98239b7d5ba7567cea1b016579d7566e292b6e81
Signed-off-by: Ed Tanous <ed@tanous.net>

cper-parse.c

diff --git a/cper-parse.c b/cper-parse.c
index 8b62ef6..12eb464 100644
--- a/cper-parse.c
+++ b/cper-parse.c
@@ -221,37 +221,22 @@
 
 	//If a platform ID exists according to the validation bits, then add it.
 	if (header->ValidationBits & 0x1) {
-		char platform_string[GUID_STRING_LENGTH];
-		guid_to_string(platform_string, &header->PlatformID);
-		json_object_object_add(header_ir, "platformID",
-				       json_object_new_string(platform_string));
+		add_guid(header_ir, "platformID", &header->PlatformID);
 	}
 
 	//If a partition ID exists according to the validation bits, then add it.
 	if (header->ValidationBits & 0x4) {
-		char partition_string[GUID_STRING_LENGTH];
-		guid_to_string(partition_string, &header->PartitionID);
-		json_object_object_add(
-			header_ir, "partitionID",
-			json_object_new_string(partition_string));
+		add_guid(header_ir, "partitionID", &header->PartitionID);
 	}
 
 	//Creator ID of the header.
-	char creator_string[GUID_STRING_LENGTH];
-	guid_to_string(creator_string, &header->CreatorID);
-	json_object_object_add(header_ir, "creatorID",
-			       json_object_new_string(creator_string));
-
+	add_guid(header_ir, "creatorID", &header->CreatorID);
 	//Notification type for the header. Some defined types are available.
 	json_object *notification_type = json_object_new_object();
-	char notification_type_string[GUID_STRING_LENGTH];
-	guid_to_string(notification_type_string, &header->NotificationType);
-	json_object_object_add(
-		notification_type, "guid",
-		json_object_new_string(notification_type_string));
+	add_guid(notification_type, "guid", &header->NotificationType);
 
 	//Add the human readable notification type if possible.
-	char *notification_type_readable = "Unknown";
+	const char *notification_type_readable = "Unknown";
 	if (guid_equal(&header->NotificationType,
 		       &gEfiEventNotificationTypeCmcGuid)) {
 		notification_type_readable = "CMC";
@@ -343,11 +328,8 @@
 
 	//Section type (GUID).
 	json_object *section_type = json_object_new_object();
-	char section_type_string[GUID_STRING_LENGTH];
-	guid_to_string(section_type_string, &section_descriptor->SectionType);
-	json_object_object_add(section_type, "data",
-			       json_object_new_string(section_type_string));
 
+	add_guid(section_type, "data", &section_descriptor->SectionType);
 	//Readable section type, if possible.
 	const char *section_type_readable = "Unknown";
 	for (size_t i = 0; i < section_definitions_len; i++) {
@@ -366,10 +348,8 @@
 
 	//If validation bits indicate it exists, add FRU ID.
 	if (section_descriptor->SecValidMask & 0x1) {
-		char fru_id_string[GUID_STRING_LENGTH];
-		guid_to_string(fru_id_string, &section_descriptor->FruId);
-		json_object_object_add(section_descriptor_ir, "fruID",
-				       json_object_new_string(fru_id_string));
+		add_guid(section_descriptor_ir, "fruID",
+			 &section_descriptor->FruId);
 	}
 
 	//If validation bits indicate it exists, add FRU text.