delta/coreboot/vboot.git, branch stabilize-RUST-14057.B

crossystem: update --help text

2021-06-26T05:43:42+00:00

Fix styling of earlier sections and link to the CrOS os_config guide.

BUG=None
TEST=`crossystem --help` looks nice
BRANCH=None

Signed-off-by: Mike Frysinger 
Change-Id: I1d5d9b080ee288541619ec4e0e8d550985051558
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2966239
Reviewed-by: Julius Werner

vboot/vboot_kernel: change recovery behaviour on kernel failure

2021-06-26T00:39:15+00:00

On load kernel failure, only call vb2api_fail when in normal
mode.

Previously, the behaviour here was to only call when attempting
to load a kernel from a fixed disk.  This maps to (1) normal
mode, and (2) developer mode when booting from an internal disk.

Excluding (2) creates a more consistent experience in developer
mode, and also prepares for a world where recovery kernels might
exist on disk.

This CL is part of a series to merge vboot1 and vboot2.0
kernel verification code; see b/181739551.

BUG=b:181739551, b:188121855
TEST=make clean && make runtests
BRANCH=none

Signed-off-by: Joel Kitching 
Change-Id: Ic2c55a073b036be98f4ce9b2e0c7fb3209de74c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2917623
Tested-by: Joel Kitching 
Commit-Queue: Joel Kitching 
Reviewed-by: Julius Werner

vboot/vboot_kernel: break disk check out to separate function

2021-06-15T19:35:56+00:00

Move disk validity check to static function is_valid_disk().

If multiple disk types are selected (e.g. REMOVABLE | FIXED),
is_valid_disk() will now check that exactly *one* of those flags
is selected by VbDiskInfo.flags.

Also, split disk flags into two 16-bit sections:
 - Disk selection in the lower 16 bits (where the disk lives)
 - Disk attributes in the higher 16 bits (extra information about
   the disk needed to access it correctly)

This CL is part of a series to merge vboot1 and vboot2.0
kernel verification code; see b/181739551.

BUG=b:181739551
TEST=make clean && make runtests
BRANCH=none

Signed-off-by: Joel Kitching 
Change-Id: Icf76ab6e92cca40810071def66aed13cdb3a7ec7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2872251
Commit-Queue: Joel Kitching 
Tested-by: Joel Kitching 
Reviewed-by: Julius Werner

vboot/vboot_kernel: remove LoadKernelParams struct

2021-06-15T19:35:55+00:00

LoadKernelParams struct is identical to
VbSelectAndLoadKernelParams.  Remove it, and use the public
interface internally.

This CL is part of a series to merge vboot1 and vboot2.0
kernel verification code; see b/181739551.

BUG=b:181739551
TEST=make clean && make runtests
BRANCH=none

Signed-off-by: Joel Kitching 
Change-Id: I8b820d18c1e9a66404a7a091aa3ccc1b050a559d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2846282
Tested-by: Joel Kitching 
Commit-Queue: Joel Kitching 
Reviewed-by: Julius Werner

vboot/vboot_kernel: pass VbDiskInfo into LoadKernel

2021-06-15T19:35:54+00:00

Pass VbDiskInfo struct into LoadKernel, rather than copying all
of its members into LoadKernelParams.  Remove the unused members
from LoadKernelParams.

This CL is part of a series to merge vboot1 and vboot2.0
kernel verification code; see b/181739551.

BUG=b:181739551
TEST=make clean && make runtests
BRANCH=none

Signed-off-by: Joel Kitching 
Change-Id: I60957426388c88b16e570b717addb5eaf65b5e4f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2846281
Reviewed-by: Joel Kitching 
Tested-by: Joel Kitching 
Commit-Queue: Joel Kitching

vboot/vboot_kernel: move workbuf init into vb2_load_partition

2021-06-15T19:35:53+00:00

Not needed prior to that.

This CL is part of a series to merge vboot1 and vboot2.0
kernel verification code; see b/181739551.

BUG=b:181739551
TEST=make clean && make runtests
BRANCH=none

Signed-off-by: Joel Kitching 
Change-Id: Ia60aa05384384bc1e2981266c33b960115734fae
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2882527
Tested-by: Joel Kitching 
Commit-Queue: Joel Kitching 
Reviewed-by: Julius Werner

vboot/vboot_kernel: move kernel/fw struct functions

2021-06-15T19:35:52+00:00

Relocate currently-in-use kernel struct functions out
of lib20 namespace, and into:
* 2struct.c for functions required at runtime
* host_common.c for functions required by host

Relocate firmware struct functions from 2common.c
into 2struct.c

vb2_common.h may be deleted as a result.

This CL is part of a series to merge vboot1 and vboot2.0
kernel verification code; see b/181739551.

BUG=b:181739551
TEST=make clean && make runtests
BRANCH=none

Signed-off-by: Joel Kitching 
Change-Id: Ic162d9633b6112ddc4a819b3e58d313dc484f304
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2825269
Tested-by: Joel Kitching 
Commit-Queue: Joel Kitching 
Reviewed-by: Julius Werner

vboot/vboot_kernel: stop printing keyblock version error when in dev mode

2021-06-15T19:35:50+00:00

Previously, the "Key version too old." error message is printed
even when in dev mode (!need_keyblock_valid).  Stop printing this
message when the key version check is not applicable.

This CL is part of a series to merge vboot1 and vboot2.0
kernel verification code; see b/181739551.

BUG=b:181739551
TEST=make clean && make runtests
BRANCH=none

Signed-off-by: Joel Kitching 
Change-Id: I1c4605342a2c53c45b74be37f2ba597670654a8e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2846252
Tested-by: Joel Kitching 
Commit-Queue: Joel Kitching 
Reviewed-by: Julius Werner

futility: updater: correct the rootkey in manifest.json

2021-06-06T06:06:30+00:00

For customization projects, the bios image should be patched by
model first, then the gbb got from the image could be correct.

Reason:
In the function, patch_image_by_model, it will apply the rootkey,
vblock_a and vblock_b of the customization project to the gbb part
of the image.

This change moves the function "find_gbb" to the position after the
function "patch_image_by_model" is called.

BUG=b:188861251
BRANCH=none
TEST=build

Change-Id: I5d80405a2a3b0ecc45e86ca3322b328479b83702
Signed-off-by: Isaac Lee 
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2929924
Reviewed-by: Hung-Te Lin

image_signing: fix rootfs mount when checking kernel params

2021-06-05T20:14:11+00:00

Use the existing mount helper so we clean up automatically when exiting.

BUG=None
TEST=CQ passes
BRANCH=None

Change-Id: I882c7f5ea3b54e08745c48378cc50702550cdc71
Signed-off-by: Mike Frysinger 
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2923828
Reviewed-by: George Engelbrecht