Fix LoadKernel() not returning LOAD_KERNEL_RECOVERY

firmware/lib/vboot_kernel.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.
  *
  * Functions for loading a kernel from disk.
  * (Firmware portion)
  */
 
 #include "vboot_kernel.h"
 
@@ skipping 121 matching lines @@
   int found_partitions = 0;
   int good_partition = -1;
   int good_partition_key_block_valid = 0;
   uint32_t tpm_version = 0;
   uint64_t lowest_version = LOWEST_TPM_VERSION;
   int rec_switch, dev_switch;
   BootMode boot_mode;
   uint32_t test_err = 0;
   uint32_t status;
 
-  /* TODO: differentiate between finding an invalid kernel (found_partitions>0)
-   * and not finding one at all.  Right now we treat them the same, and return
-   * LOAD_KERNEL_INVALID for both. */
-  int retval = LOAD_KERNEL_INVALID;
+  int retval = LOAD_KERNEL_RECOVERY;
   int recovery = VBNV_RECOVERY_RO_UNSPECIFIED;
 
   /* Setup NV storage */
   VbNvSetup(vnc);
 
   /* Sanity Checks */
   if (!params ||
       !params->bytes_per_lba ||
       !params->ending_lba ||
       !params->kernel_buffer ||
@@ skipping 379 matching lines @@
         if (status == TPM_E_MUST_REBOOT)
           retval = LOAD_KERNEL_REBOOT;
         else
           recovery = VBNV_RECOVERY_RW_TPM_ERROR;
         goto LoadKernelExit;
       }
     }
 
     /* Success! */
     retval = LOAD_KERNEL_SUCCESS;
+  } else {
+    /* TODO: differentiate between finding an invalid kernel
+     * (found_partitions>0) and not finding one at all.  Right now we
+     * treat them the same, and return LOAD_KERNEL_INVALID for both. */
+    retval = LOAD_KERNEL_INVALID;
   }
 
 LoadKernelExit:
 
   /* Save whether the good partition's key block was fully verified */
   VbNvSet(vnc, VBNV_FW_VERIFIED_KERNEL_KEY, good_partition_key_block_valid);
 
   /* Store recovery request, if any, then tear down non-volatile storage */
   VbNvSet(vnc, VBNV_RECOVERY_REQUEST, LOAD_KERNEL_RECOVERY == retval ?
           recovery : VBNV_RECOVERY_NOT_REQUESTED);
   VbNvTeardown(vnc);
 
   /* Store how much shared data we used, if any */
   if (shared)
     params->shared_data_size = shared->data_used;
 
   return retval;
 }