From 07f78652276e75d3a1102e58de6078d08ceb4e69 Mon Sep 17 00:00:00 2001
From: Randall Spangler <rspangler@chromium.org>
Date: Wed, 23 Jun 2010 19:42:09 -0700
Subject: [PATCH] fix passing key out of LoadFirmware

Review URL: http://codereview.chromium.org/2825019
---
 firmware/lib/vboot_firmware.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/firmware/lib/vboot_firmware.c b/firmware/lib/vboot_firmware.c
index a59b238e85..8fa4c53834 100644
--- a/firmware/lib/vboot_firmware.c
+++ b/firmware/lib/vboot_firmware.c
@@ -45,11 +45,14 @@ int LoadFirmware(LoadFirmwareParams* params) {
 
   /* Clear output params in case we fail */
   params->firmware_index = 0;
-  params->kernel_sign_key_blob = NULL;
-  params->kernel_sign_key_size = 0;
 
   debug("LoadFirmware started...\n");
 
+  if (params->kernel_sign_key_size < sizeof(VbPublicKey)) {
+    debug("Kernel sign key buffer too small\n");
+    return LOAD_FIRMWARE_RECOVERY;
+  }
+
   /* Must have a root key */
   if (!root_key) {
     debug("No root key\n");