firmware/lib/vboot_firmware.c - Issue 6626020: Only advance kernel version when the booted partition has a valid key block

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: firmware/lib/vboot_firmware.c

Issue 6626020: Only advance kernel version when the booted partition has a valid key block (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master

Patch Set: Created 9 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « firmware/lib/tpm_lite/tlcl.c ('k') | firmware/lib/vboot_kernel.c » ('j') | no next file with comments »

OLD	NEW
1 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.	1 /* Copyright (c) 2010-2011 The Chromium OS Authors. All rights reserved.

2 * Use of this source code is governed by a BSD-style license that can be	2 * Use of this source code is governed by a BSD-style license that can be

3 * found in the LICENSE file.	3 * found in the LICENSE file.

4 *	4 *

5 * High-level firmware API for loading and verifying rewritable firmware.	5 * High-level firmware API for loading and verifying rewritable firmware.

6 * (Firmware portion)	6 * (Firmware portion)

7 */	7 */

8	8

9 #include "load_firmware_fw.h"	9 #include "load_firmware_fw.h"

10 #include "rollback_index.h"	10 #include "rollback_index.h"

11 #include "utility.h"	11 #include "utility.h"

(...skipping 311 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
323 uint32_t status = RollbackS3Resume();	323 uint32_t status = RollbackS3Resume();

324	324

325 /* If we can't resume, just do a full reboot. No need to go to recovery	325 /* If we can't resume, just do a full reboot. No need to go to recovery

326 * mode here, since if the TPM is really broken we'll catch it on the	326 * mode here, since if the TPM is really broken we'll catch it on the

327 * next boot. */	327 * next boot. */

328 if (status == TPM_SUCCESS)	328 if (status == TPM_SUCCESS)

329 return LOAD_FIRMWARE_SUCCESS;	329 return LOAD_FIRMWARE_SUCCESS;

330 else	330 else

331 return LOAD_FIRMWARE_REBOOT;	331 return LOAD_FIRMWARE_REBOOT;

332 }	332 }

OLD	NEW