X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Fflash%2Fflash.c;h=3505cb4f959be52b5cf9068bb6e7b6359f980e83;hb=cf9e0cd6f7caf7b171457f7bf9f56f23ec3e478c;hp=464b8760b54db8cdd2d8b51564f9dbdcf5a81b26;hpb=48ca02faa9816b158cb6fa56a4107701143cb212;p=petitboot

diff --git a/lib/flash/flash.c b/lib/flash/flash.c
index 464b876..3505cb4 100644
--- a/lib/flash/flash.c
+++ b/lib/flash/flash.c
@@ -31,6 +31,8 @@
 #include <libflash/file.h>
 #include <libflash/ecc.h>
 
+#define SECURE_BOOT_HEADERS_SIZE 4096
+#define ROM_MAGIC_NUMBER 0x17082011
 
 struct flash_info {
 	/* Device information */
@@ -94,7 +96,7 @@ static struct flash_info *flash_setup_buffer(void *ctx, const char *partition)
 
 	rc = ffs_init(0, info->size, info->bl, &info->ffs, 1);
 	if (rc) {
-		pb_log("%s: Failed to init ffs\n", __func__);
+		pb_log_fn("Failed to init ffs\n");
 		goto out_flash;
 	}
 
@@ -148,6 +150,16 @@ out:
 	return NULL;
 }
 
+/* See stb_is_container() in Skiboot */
+static bool is_signed(char *buffer, uint32_t len)
+{
+	if (!buffer || len <= SECURE_BOOT_HEADERS_SIZE)
+		return false;
+	if (be32_to_cpu(*(uint32_t *)buffer) != ROM_MAGIC_NUMBER)
+		return false;
+	return true;
+}
+
 int flash_parse_version(void *ctx, char ***versions, bool current)
 {
 	char *saveptr, *tok,  **tmp, *buffer;
@@ -171,7 +183,7 @@ int flash_parse_version(void *ctx, char ***versions, bool current)
 	len = cur_info->attr_data_len -  ecc_size(cur_info->attr_data_len);
 	buffer = talloc_array(cur_info, char, len);
 	if (!buffer) {
-		pb_log("%s: Failed to init buffer!\n", __func__);
+		pb_log_fn("Failed to init buffer!\n");
 		goto out;
 	}
 
@@ -182,12 +194,16 @@ int flash_parse_version(void *ctx, char ***versions, bool current)
 		goto out;
 	}
 
+	/* Check if this partition is signed */
+	if (is_signed(buffer, len))
+		buffer += SECURE_BOOT_HEADERS_SIZE;
+
 	/* open-power-platform */
 	tok = strtok_r(buffer, delim, &saveptr);
 	if (tok) {
 		tmp = talloc_realloc(ctx, tmp, char *, n + 1);
 		if (!tmp) {
-			pb_log("%s: Failed to allocate memory\n", __func__);
+			pb_log_fn("Failed to allocate memory\n");
 			goto out;
 		}
 		tmp[n++] = talloc_strdup(ctx, tok);
@@ -198,7 +214,7 @@ int flash_parse_version(void *ctx, char ***versions, bool current)
 		/* Ignore leading tab from subsequent lines */
 		tmp = talloc_realloc(ctx, tmp, char *, n + 1);
 		if (!tmp) {
-			pb_log("%s: Failed to reallocate memory\n", __func__);
+			pb_log_fn("Failed to reallocate memory\n");
 			n = 0;
 			goto out;
 		}