diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2014-09-23 15:53:56 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@google.com> | 2015-03-24 15:19:36 +0100 |
| commit | 6abe7c699679e27d0ae84b803994e5eacfaea538 (patch) | |
| tree | e8079aa8f8af212aa2cd230127964ff3cd5c47f7 /src/vendorcode/google/chromeos/chromeos.c | |
| parent | 35890170b56941a155635d57b9ee693e5f690311 (diff) | |
vboot2: avoid fall through when hard_reset is not implemented
this change makes prevent execution from falling through to unverified
code when hard_reset is not implemented. it also includes a few touch-ups.
BUG=None
TEST=Booted Veyron Pinky. Verified firmware selection in the log.
BRANCH=None
Original-Change-Id: I9b02ab766172a62c98b434c29f310bc4a44f342d
Original-Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/219625
Original-Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Original-Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
(cherry picked from commit d1f5207d83d2247b55f2bb9d02ac843305fc3ded)
Change-Id: I99dd5a2ca3a5369accb14408ea9d266bf60e7132
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8884
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/vendorcode/google/chromeos/chromeos.c')
| -rw-r--r-- | src/vendorcode/google/chromeos/chromeos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/chromeos.c index 5696aec787..3a499d56e6 100644 --- a/src/vendorcode/google/chromeos/chromeos.c +++ b/src/vendorcode/google/chromeos/chromeos.c @@ -173,7 +173,7 @@ struct vboot_components *vboot_locate_components(struct vboot_region *region) size_t req_size; struct vboot_components *vbc; - req_size = sizeof(*region); + req_size = sizeof(*vbc); req_size += sizeof(struct vboot_component_entry) * MAX_PARSED_FW_COMPONENTS; @@ -259,6 +259,7 @@ struct vb2_working_data * const vboot_get_working_data(void) void vboot_reboot(void) { hard_reset(); + die("failed to reboot"); } #endif |