platform-intel: limit guid length

Moving GUID_STR_MAX to header to use it as
a length limitation for snprintf function.

Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>

diff --git a/platform-intel.c b/platform-intel.c
index eb6e1b7e38077b0c5d9dc24b50af151114e8f69b..ef90c3fdd1f818c95153892f72f6b608dfc56473 100644 (file)
--- a/platform-intel.c
+++ b/platform-intel.c
@@ -510,9 +510,6 @@ static const struct imsm_orom *find_imsm_hba_orom(struct sys_dev *hba)
        return get_orom_by_device_id(hba->dev_id);
 }
 
-#define GUID_STR_MAX   37  /* according to GUID format:
-                            * xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" */
-
 #define EFI_GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
 ((struct efi_guid) \
 {{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \

diff --git a/platform-intel.h b/platform-intel.h
index 2c0f4e39291972664b39b09e71467473b04a953c..ba97fb04274a1703264d443dd3b4d5a62bc72b3b 100644 (file)
--- a/platform-intel.h
+++ b/platform-intel.h
@@ -19,6 +19,9 @@
 #include <asm/types.h>
 #include <strings.h>
 
+/* according to GUID format: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" */
+#define GUID_STR_MAX   37
+
 /* The IMSM Capability (IMSM AHCI and ISCU OROM/EFI variable) Version Table definition */
 struct imsm_orom {
        __u8 signature[4];
@@ -229,7 +232,7 @@ extern struct orom_entry *orom_entries;
 
 static inline char *guid_str(char *buf, struct efi_guid guid)
 {
-       sprintf(buf, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+       snprintf(buf, GUID_STR_MAX, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                 guid.b[3], guid.b[2], guid.b[1], guid.b[0],
                 guid.b[5], guid.b[4], guid.b[7], guid.b[6],
                 guid.b[8], guid.b[9], guid.b[10], guid.b[11],