Print LoadKernel() debug data from VbSharedData

utility/crossystem_main.c

 /* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Chrome OS firmware/system interface utility
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "crossystem.h"
 
+/* Max length of a string parameter */
+#define MAX_STRING 8192
+
 /* Flags for Param */
 #define IS_STRING      0x01  /* String (not present = integer) */
 #define CAN_WRITE      0x02  /* Writable (not present = read-only */
 #define NO_PRINT_ALL   0x04  /* Don't print contents of parameter when
                               * doing a print-all */
 
 typedef struct Param {
   const char* name;  /* Parameter name */
   int flags;         /* Flags (see above) */
   const char* desc;  /* Human-readable description */
@@ skipping 21 matching lines @@
   {"tpm_kernver", 0, "Kernel version stored in TPM", "0x%08x"},
   /* Read-only strings */
   {"hwid", IS_STRING, "Hardware ID"},
   {"fwid", IS_STRING, "Active firmware ID"},
   {"ro_fwid", IS_STRING, "Read-only firmware ID"},
   {"mainfw_act", IS_STRING, "Active main firmware"},
   {"mainfw_type", IS_STRING, "Active main firmware type"},
   {"ecfw_act", IS_STRING, "Active EC firmware"},
   {"kernkey_vfy", IS_STRING, "Type of verification done on kernel key block"},
   {"vdat_timers", IS_STRING, "Timer values from VbSharedData"},
-  {"vdat_lfdebug", IS_STRING, "LoadFirmware() debug data VbSharedData"},
   /* Writable integers */
   {"nvram_cleared", CAN_WRITE, "Have NV settings been lost?  Write 0 to clear"},
   {"kern_nv", CAN_WRITE, "Non-volatile field for kernel use", "0x%08x"},
   {"recovery_request", CAN_WRITE, "Recovery mode request (writable)"},
   {"dbg_reset", CAN_WRITE, "Debug reset mode request (writable)"},
   {"fwb_tries", CAN_WRITE, "Try firmware B count (writable)"},
   {"vbtest_errfunc", CAN_WRITE, "Verified boot test error function (writable)"},
   {"vbtest_errno", CAN_WRITE, "Verified boot test error number (writable)"},
-
+  /* Fields not shown in a print-all list */
+  {"vdat_lfdebug", IS_STRING|NO_PRINT_ALL,
+   "LoadFirmware() debug data (not in print-all)"},
+  {"vdat_lkdebug", IS_STRING|NO_PRINT_ALL,
+   "LoadKernel() debug data (not in print-all)"},
   /* Terminate with null name */
   {NULL, 0, NULL}
 };
 
 
 /* Print help */
 void PrintHelp(const char *progname) {
   const Param *p;
 
   printf("\nUsage:\n"
@@ skipping 43 matching lines @@
     return (0 == VbSetSystemPropertyInt(p->name, i) ? 0 : 1);
   }
 }
 
 
 /* Compares the parameter with the expected value.
  *
  * Returns 0 if success (match), non-zero if error (mismatch). */
 int CheckParam(const Param* p, char* expect) {
   if (p->flags & IS_STRING) {
-    char buf[256];
+    char buf[MAX_STRING];
     const char* v = VbGetSystemPropertyString(p->name, buf, sizeof(buf));
     if (!v || 0 != strcmp(v, expect))
       return 1;
   } else {
     char* e;
     int i = (int)strtol(expect, &e, 0);
     int v = VbGetSystemPropertyInt(p->name);
     if (!*expect || (e && *e))
       return 1;
     if (v == -1 || i != v)
       return 1;
   }
   return 0;
 }
 
 
 /* Print the specified parameter.
  *
  * Returns 0 if success, non-zero if error. */
 int PrintParam(const Param* p) {
   if (p->flags & IS_STRING) {
-    char buf[256];
+    char buf[MAX_STRING];
     const char* v = VbGetSystemPropertyString(p->name, buf, sizeof(buf));
     if (!v)
       return 1;
     printf("%s", v);
   } else {
     int v = VbGetSystemPropertyInt(p->name);
     if (v == -1)
       return 1;
     printf(p->format ? p->format : "%d", v);
   }
   return 0;
 }
 
 
 /* Print all parameters with descriptions,
  *
  * Returns 0 if success, non-zero if error. */
 int PrintAllParams(void) {
   const Param* p;
   int retval = 0;
-  char buf[256];
+  char buf[MAX_STRING];
   const char* value;
 
   for (p = sys_param_list; p->name; p++) {
     if (p->flags & NO_PRINT_ALL)
       continue;
     if (p->flags & IS_STRING) {
       value = VbGetSystemPropertyString(p->name, buf, sizeof(buf));
     } else {
       int v = VbGetSystemPropertyInt(p->name);
       if (v == -1)
@@ skipping 53 matching lines @@
     if (has_set)
       retval = SetParam(p, value);
     else if (has_expect)
       retval = CheckParam(p, value);
     else
       retval = PrintParam(p);
   }
 
   return retval;
 }