commit fabe3f4cc2204755d26ff611a1631fd51c8b0fa6
author Hung-Te Lin <hungte@chromium.org> Fri Jul 05 02:29:47 2019
committer chrome-bot <chrome-bot@chromium.org> Thu Jul 11 23:15:43 2019
tree e5239bf292c078381e7d19833a31752f0f72f5df
parent 345c7067c30583ae0a8478d4114683b07e43d690

vpd: Add '--raw' for parsing raw VPD contents

The VPD kernel driver does not export key names with dot but we use it
for manufacturing stage, where the userland 'vpd' can read and write.

However, to parse boot time values efficiently, factory software
startup will try to fetch these special values using kernel driver and
fail to read correct values.

As a result, we want the VPD userland driver being able to read the raw
blob exported from VPD kernel driver, the 'ro_raw' and 'rw_raw' files.

A new --raw is now introduced so the `vpd` utility can read a VPD
key-value store without VPD headers, just like what the kernel driver
provides.

BUG=b:135048597
TEST=vpd -l --raw /sys/firmware/vpd/ro_raw
BRANCH=none

Change-Id: I83415e966ccf6ab878cc48a407ac20da99a9aa87
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1686805
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Wei-Han Chen <stimim@chromium.org>

vpd.c

diff --git a/vpd.c b/vpd.c
index 3952c86..1adac95 100644
--- a/vpd.c
+++ b/vpd.c
@@ -521,6 +521,32 @@
   return buf;
 }
 
+vpd_err_t loadRawFile(const char *filename, struct PairContainer *container) {
+  uint8_t *vpd_buf;
+  uint32_t index, file_size;
+  vpd_err_t retval = VPD_OK;
+
+  if (!(vpd_buf = readFileContent(filename, &file_size))) {
+    fprintf(stderr, "[ERROR] Cannot LoadRawFile('%s').\n", filename);
+    return VPD_ERR_SYSTEM;
+  }
+
+  for (index = 0;
+       index < file_size &&
+       vpd_buf[index] != VPD_TYPE_TERMINATOR &&
+       vpd_buf[index] != VPD_TYPE_IMPLICIT_TERMINATOR;) {
+    retval = decodeToContainer(container, file_size, vpd_buf, &index);
+    if (VPD_OK != retval) {
+      fprintf(stderr, "decodeToContainer() error.\n");
+      goto teardown;
+    }
+  }
+  file_flag |= HAS_VPD_2_0;
+
+teardown:
+  free(vpd_buf);
+  return retval;
+}
 
 vpd_err_t loadFile(const char *filename, struct PairContainer *container,
              int overwrite_it) {
@@ -897,6 +923,7 @@
   printf("      -i <partition>   Specify VPD partition name in fmap.\n");
   printf("      -l               List content in the file.\n");
   printf("      --sh             Dump content for shell script.\n");
+  printf("      --raw            Parse from a raw blob (without headers).\n");
   printf("      -0/--null-terminated\n");
   printf("                       Dump content in null terminate format.\n");
   printf("      -O               Overwrite and re-format VPD partition.\n");
@@ -927,6 +954,7 @@
     {"overwrite", 0, 0, 'O'},
     {"filter", 0, 0, 'g'},
     {"sh", 0, &export_type, VPD_EXPORT_AS_PARAMETER},
+    {"raw", 0, 0, 'R'},
     {"null-terminated", 0, 0, '0'},
     {"delete", 0, 0, 'd'},
     {0, 0, 0, 0}
@@ -943,6 +971,7 @@
   int modified = 0;
   int num_to_delete;
   int read_from_file = 0;
+  int raw_input = 0;
 
   initContainer(&file);
   initContainer(&set_argument);
@@ -1028,6 +1057,10 @@
         export_type = VPD_EXPORT_NULL_TERMINATE;
         break;
 
+      case 'R':
+        raw_input = 1;
+        break;
+
       case 0:
         break;
 
@@ -1046,14 +1079,6 @@
     goto teardown;
   }
 
-  tmp_part_file = myMkTemp();
-  tmp_full_file = myMkTemp();
-  if (!tmp_part_file || !tmp_full_file) {
-    fprintf(stderr, "[ERROR] Failed creating temporary files.\n");
-    retval = VPD_ERR_SYSTEM;
-    goto teardown;
-  }
-
   if (list_it && key_to_export) {
     fprintf(stderr, "[ERROR] -l and -g must be mutually exclusive.\n");
     retval = VPD_ERR_SYNTAX;
@@ -1067,6 +1092,27 @@
     goto teardown;
   }
 
+  if (raw_input && !filename) {
+    fprintf(stderr, "[ERROR] Needs -f FILE for raw input.\n");
+    retval = VPD_ERR_SYNTAX;
+    goto teardown;
+  }
+
+  if (raw_input && (lenOfContainer(&set_argument) ||
+                    lenOfContainer(&del_argument))) {
+    fprintf(stderr, "[ERROR] Changing in raw mode is not supported.\n");
+    retval = VPD_ERR_SYNTAX;
+    goto teardown;
+  }
+
+  tmp_part_file = myMkTemp();
+  tmp_full_file = myMkTemp();
+  if (!tmp_part_file || !tmp_full_file) {
+    fprintf(stderr, "[ERROR] Failed creating temporary files.\n");
+    retval = VPD_ERR_SYSTEM;
+    goto teardown;
+  }
+
   /* to avoid malicious attack, we replace suspicious chars. */
   fmapNormalizeAreaName(fmap_vpd_area_name);
 
@@ -1093,7 +1139,10 @@
     save_file = filename;
   }
 
-  retval = loadFile(load_file, &file, overwrite_it);
+  if (raw_input)
+    retval = loadRawFile(load_file, &file);
+  else
+    retval = loadFile(load_file, &file, overwrite_it);
   if (VPD_OK != retval) {
     fprintf(stderr, "loadFile('%s') error.\n", load_file);
     goto teardown;