Revert "Revert "Add --kloadaddr option to utilities""

utility/vbutil_kernel.c

 /* Copyright (c) 2010 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.
  *
  * Verified boot kernel utility
  */
 
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>  /* For PRIu64 */
@@ skipping 17 matching lines @@
 
 static const int DEFAULT_PADDING = 65536;
 
 /* Command line options */
 enum {
   OPT_MODE_PACK = 1000,
   OPT_MODE_REPACK,
   OPT_MODE_VERIFY,
   OPT_ARCH,
   OPT_OLDBLOB,
+  OPT_KLOADADDR,
   OPT_KEYBLOCK,
   OPT_SIGNPUBKEY,
   OPT_SIGNPRIVATE,
   OPT_VERSION,
   OPT_VMLINUZ,
   OPT_BOOTLOADER,
   OPT_CONFIG,
   OPT_VBLOCKONLY,
   OPT_PAD,
   OPT_VERBOSE,
 };
 
 enum {
   ARCH_ARM,
   ARCH_X86 /* default */
 };
 
 static struct option long_opts[] = {
   {"pack", 1, 0,                      OPT_MODE_PACK               },
   {"repack", 1, 0,                    OPT_MODE_REPACK             },
   {"verify", 1, 0,                    OPT_MODE_VERIFY             },
   {"arch", 1, 0,                      OPT_ARCH                    },
   {"oldblob", 1, 0,                   OPT_OLDBLOB                 },
+  {"kloadaddr", 1, 0,                 OPT_KLOADADDR               },
   {"keyblock", 1, 0,                  OPT_KEYBLOCK                },
   {"signpubkey", 1, 0,                OPT_SIGNPUBKEY              },
   {"signprivate", 1, 0,               OPT_SIGNPRIVATE             },
   {"version", 1, 0,                   OPT_VERSION                 },
   {"vmlinuz", 1, 0,                   OPT_VMLINUZ                 },
   {"bootloader", 1, 0,                OPT_BOOTLOADER              },
   {"config", 1, 0,                    OPT_CONFIG                  },
   {"vblockonly", 0, 0,                OPT_VBLOCKONLY              },
   {"pad", 1, 0,                       OPT_PAD                     },
   {"verbose", 0, 0,                   OPT_VERBOSE                 },
@@ skipping 14 matching lines @@
           "    --keyblock <file>         Key block in .keyblock format\n"
           "    --signprivate <file>"
           "      Private key to sign kernel data, in .vbprivk format\n"
           "    --version <number>        Kernel version\n"
           "    --vmlinuz <file>          Linux kernel bzImage file\n"
           "    --bootloader <file>       Bootloader stub\n"
           "    --config <file>           Command line file\n"
           "    --arch <arch>             Cpu architecture (default x86)\n"
           "\n"
           "  Optional:\n"
+          "    --kloadaddr <address>     Assign kernel body load address\n"
           "    --pad <number>            Verification padding size in bytes\n"
           "    --vblockonly              Emit just the verification blob\n",
           progname);
   fprintf(stderr,
           "\nOR\n\n"
           "Usage:  %s --repack <file> [PARAMETERS]\n"
           "\n"
           "  Required parameters (of --keyblock, --config, and --version \n"
           "    at least one is required):\n"
           "    --keyblock <file>         Key block in .keyblock format\n"
           "    --signprivate <file>"
           "      Private key to sign kernel data, in .vbprivk format\n"
           "    --oldblob <file>          Previously packed kernel blob\n"
           "    --config <file>           New command line file\n"
           "    --version <number>        Kernel version\n"
           "\n"
           "  Optional:\n"
+          "    --kloadaddr <address>     Assign kernel body load address\n"
           "    --pad <number>            Verification padding size in bytes\n"
           "    --vblockonly              Emit just the verification blob\n",
           progname);
   fprintf(stderr,
           "\nOR\n\n"
           "Usage:  %s --verify <file> [PARAMETERS]\n"
           "\n"
           "  Optional:\n"
           "    --signpubkey <file>"
           "       Public key to verify kernel keyblock, in .vbpubk format\n"
           "    --verbose                 Print a more detailed report\n"
           "    --keyblock <file>"
-          "       Outputs the verified key block, in .keyblock format\n"
+          "         Outputs the verified key block, in .keyblock format\n"
+          "    --kloadaddr <address>     Assign kernel body load address\n"
           "\n",
           progname);
   return 1;
 }
 
 static void Debug(const char *format, ...) {
   if (!opt_debug)
     return;
 
   va_list ap;
@@ skipping 57 matching lines @@
   uint8_t *blob;
 
   /* these fields are not always initialized */
   VbKernelPreambleHeader* preamble;
   VbKeyBlockHeader* key_block;
   uint8_t *buf;
 
 } blob_t;
 
 /* Given a blob return the location of the kernel command line buffer. */
-static char* BpCmdLineLocation(blob_t *bp)
+static char* BpCmdLineLocation(blob_t *bp, uint64_t kernel_body_load_address)
 {
-  return (char*)(bp->blob + bp->bootloader_address - CROS_32BIT_ENTRY_ADDR -
+  return (char*)(bp->blob + bp->bootloader_address - kernel_body_load_address -
                  CROS_CONFIG_SIZE - CROS_PARAMS_SIZE);
 }
 
 static void FreeBlob(blob_t *bp) {
   if (bp) {
     if (bp->blob)
       Free(bp->blob);
     if (bp->buf)
       Free(bp->buf);
     Free(bp);
@@ skipping 27 matching lines @@
     }
   }
   return config_buf;
 }
 
 /* Create a blob from its components */
 static blob_t *NewBlob(uint64_t version,
                        const char* vmlinuz,
                        const char* bootloader_file,
                        const char* config_file,
-                       int arch) {
+                       int arch,
+                       uint64_t kernel_body_load_address) {
   blob_t* bp;
   struct linux_kernel_header* lh = 0;
   struct linux_kernel_params* params = 0;
   uint8_t* config_buf;
   uint64_t config_size;
   uint8_t* bootloader_buf;
   uint64_t bootloader_size;
   uint8_t* kernel_buf;
   uint64_t kernel_size;
   uint64_t kernel32_start = 0;
@@ skipping 70 matching lines @@
   bp->blob = blob;
 
   /* Copy the 32-bit kernel. */
   Debug("kernel goes at blob+=0x%" PRIx64 "\n", now);
   if (kernel32_size)
     Memcpy(blob + now, kernel_buf + kernel32_start, kernel32_size);
   now += roundup(now + kernel32_size, CROS_ALIGN);
 
   Debug("config goes at blob+0x%" PRIx64 "\n", now);
   /* Find the load address of the commandline. We'll need it later. */
-  cmdline_addr = CROS_32BIT_ENTRY_ADDR + now +
+  cmdline_addr = kernel_body_load_address + now +
       find_cmdline_start((char *)config_buf, config_size);
   Debug(" cmdline_addr=0x%" PRIx64 "\n", cmdline_addr);
 
   /* Copy the config. */
   if (config_size)
     Memcpy(blob + now, config_buf, config_size);
   now += CROS_CONFIG_SIZE;
 
   /* The zeropage data is next. Overlay the linux_kernel_header onto it, and
    * tweak a few fields. */
@@ skipping 16 matching lines @@
   params->e820_entries[0].segment_size = 0x00001000;
   params->e820_entries[0].segment_type = E820_TYPE_RAM;
   params->e820_entries[1].start_addr = 0xfffff000;
   params->e820_entries[1].segment_size = 0x00001000;
   params->e820_entries[1].segment_type = E820_TYPE_RESERVED;
   now += CROS_PARAMS_SIZE;
 
   /* Finally, append the bootloader. Remember where it will load in
    * memory, too. */
   Debug("bootloader goes at blob+=0x%" PRIx64 "\n", now);
-  bp->bootloader_address = CROS_32BIT_ENTRY_ADDR + now;
+  bp->bootloader_address = kernel_body_load_address + now;
   bp->bootloader_size = roundup(bootloader_size, CROS_ALIGN);
   Debug(" bootloader_address=0x%" PRIx64 "\n", bp->bootloader_address);
   Debug(" bootloader_size=0x%" PRIx64 "\n", bp->bootloader_size);
   if (bootloader_size)
     Memcpy(blob + now, bootloader_buf, bootloader_size);
   now += bp->bootloader_size;
   Debug("end of blob is 0x%" PRIx64 "\n", now);
 
   /* Free input buffers */
   Free(kernel_buf);
@@ skipping 127 matching lines @@
       Free(buf);
     }
   }
   return bp;
 }
 
 
 /* Pack a .kernel */
 static int Pack(const char* outfile, const char* keyblock_file,
                 const char* signprivate, blob_t *bp, uint64_t pad,
-                int vblockonly) {
+                int vblockonly,
+                uint64_t kernel_body_load_address) {
   VbPrivateKey* signing_key;
   VbSignature* body_sig;
   VbKernelPreambleHeader* preamble;
   VbKeyBlockHeader* key_block;
   uint64_t key_block_size;
   FILE* f;
   uint64_t i;
 
   if (!outfile) {
     error("Must specify output filename\n");
@@ skipping 33 matching lines @@
 
   /* Sign the kernel data */
   body_sig = CalculateSignature(bp->blob, bp->blob_size, signing_key);
   if (!body_sig) {
     error("Error calculating body signature\n");
     return 1;
   }
 
   /* Create preamble */
   preamble = CreateKernelPreamble(bp->kernel_version,
-                                  CROS_32BIT_ENTRY_ADDR,
+                                  kernel_body_load_address,
                                   bp->bootloader_address,
                                   bp->bootloader_size,
                                   body_sig,
                                   pad - key_block_size,
                                   signing_key);
   if (!preamble) {
     error("Error creating preamble.\n");
     return 1;
   }
 
@@ skipping 28 matching lines @@
 
   fclose(f);
 
   /* Success */
   return 0;
 }
 
 /*
  * Replace kernel command line in a blob representing a kernel.
  */
-static int ReplaceConfig(blob_t* bp, const char* config_file)
+static int ReplaceConfig(blob_t* bp, const char* config_file,
+    uint64_t kernel_body_load_address)
 {
   uint8_t* new_conf;
   uint64_t config_size;
 
   if (!config_file) {
     return 0;
   }
 
   new_conf = ReadConfigFile(config_file, &config_size);
   if (!new_conf) {
     return 1;
   }
 
   /* fill the config buffer with zeros */
-  Memset(BpCmdLineLocation(bp), 0, CROS_CONFIG_SIZE);
-  Memcpy(BpCmdLineLocation(bp), new_conf, config_size);
+  Memset(BpCmdLineLocation(bp, kernel_body_load_address), 0, CROS_CONFIG_SIZE);
+  Memcpy(BpCmdLineLocation(bp, kernel_body_load_address),
+      new_conf, config_size);
   Free(new_conf);
   return 0;
 }
 
 static int Verify(const char* infile, const char* signpubkey, int verbose,
-                  const char* key_block_file) {
+                  const char* key_block_file,
+                  uint64_t kernel_body_load_address) {
 
   VbKeyBlockHeader* key_block;
   VbKernelPreambleHeader* preamble;
   VbPublicKey* data_key;
   VbPublicKey* sign_key = NULL;
   RSAPublicKey* rsa;
   blob_t* bp;
   uint64_t now;
   int rv = 1;
 
@@ skipping 98 matching lines @@
     goto verify_exit;
   }
   printf("Body verification succeeded.\n");
 
   rv = 0;
 
   if (!verbose) {
     goto verify_exit;
   }
 
-  printf("Config:\n%s\n", BpCmdLineLocation(bp));
+  printf("Config:\n%s\n", BpCmdLineLocation(bp, kernel_body_load_address));
 
 verify_exit:
   FreeBlob(bp);
   return rv;
 }
 
 
 int main(int argc, char* argv[]) {
   char* filename = NULL;
   char* oldfile = NULL;
   char* key_block_file = NULL;
   char* signpubkey = NULL;
   char* signprivate = NULL;
   int version = -1;
   char* vmlinuz = NULL;
   char* bootloader = NULL;
   char* config_file = NULL;
   int arch = ARCH_X86;
   int vblockonly = 0;
   int verbose = 0;
+  uint64_t kernel_body_load_address = CROS_32BIT_ENTRY_ADDR;
   uint64_t pad = DEFAULT_PADDING;
   int mode = 0;
   int parse_error = 0;
   char* e;
   int i,r;
   blob_t *bp;
 
 
   char *progname = strrchr(argv[0], '/');
   if (progname)
@@ skipping 34 matching lines @@
         else {
           fprintf(stderr, "Unknown architecture string: %s\n", optarg);
           parse_error = 1;
         }
         break;
 
       case OPT_OLDBLOB:
         oldfile = optarg;
         break;
 
+      case OPT_KLOADADDR:
+        kernel_body_load_address = strtoul(optarg, &e, 0);
+        if (!*optarg || (e && *e)) {
+          fprintf(stderr, "Invalid --kloadaddr\n");
+          parse_error = 1;
+        }
+        break;
+
       case OPT_KEYBLOCK:
         key_block_file = optarg;
         break;
 
       case OPT_SIGNPUBKEY:
         signpubkey = optarg;
         break;
 
       case OPT_SIGNPRIVATE:
         signprivate = optarg;
@@ skipping 35 matching lines @@
         verbose = 1;
         break;
     }
   }
 
   if (parse_error)
     return PrintHelp(progname);
 
   switch(mode) {
     case OPT_MODE_PACK:
-      bp = NewBlob(version, vmlinuz, bootloader, config_file, arch);
+      bp = NewBlob(version, vmlinuz, bootloader, config_file, arch,
+          kernel_body_load_address);
       if (!bp)
         return 1;
-      r = Pack(filename, key_block_file, signprivate, bp, pad, vblockonly);
+      r = Pack(filename, key_block_file, signprivate, bp, pad, vblockonly,
+          kernel_body_load_address);
       FreeBlob(bp);
       return r;
 
     case OPT_MODE_REPACK:
       if (!config_file && !key_block_file && (version<0)) {
         fprintf(stderr,
                 "You must supply at least one of "
                 "--config, --keyblock or --version\n");
         return 1;
       }
 
       bp = OldBlob(oldfile);
       if (!bp)
         return 1;
-      r = ReplaceConfig(bp, config_file);
+      r = ReplaceConfig(bp, config_file, kernel_body_load_address);
       if (!r) {
         if (version >= 0) {
           bp->kernel_version = (uint64_t) version;
         }
-        r = Pack(filename, key_block_file, signprivate, bp, pad, vblockonly);
+        r = Pack(filename, key_block_file, signprivate, bp, pad, vblockonly,
+            kernel_body_load_address);
       }
       FreeBlob(bp);
       return r;
 
     case OPT_MODE_VERIFY:
-      return Verify(filename, signpubkey, verbose, key_block_file);
+      return Verify(filename, signpubkey, verbose, key_block_file,
+          kernel_body_load_address);
 
     default:
       fprintf(stderr,
               "You must specify a mode: --pack, --repack or --verify\n");
       return PrintHelp(progname);
   }
 }