scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 02:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix load_kernel_test, add check to LoadKernel to detect bad args.

Browse Source 
load_kernel_test was failing because it wasn't setting
params->kernel_buffer_size before calling LoadKernel(). This fixes that,
plus adds some checks to LoadKernel so that it will notice bad params if it
happens again.

Review URL: http://codereview.chromium.org/3060004
This commit is contained in:
Bill Richardson
2010-07-22 12:23:47 -07:00
parent ada3fa9ee6
commit e272940ec5
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
firmware/lib/vboot_kernel.c
View File

@@ -112,13 +112,11 @@ int WriteAndFreeGptData(GptData* gptdata) {
__pragma(warning(disable: 4127)) __pragma(warning(disable: 4127))
int LoadKernel(LoadKernelParams* params) { int LoadKernel(LoadKernelParams* params) {
VbPublicKey* kernel_subkey;
VbPublicKey* kernel_subkey = (VbPublicKey*)params->header_sign_key_blob;
GptData gpt; GptData gpt;
uint64_t part_start, part_size; uint64_t part_start, part_size;
uint64_t blba = params->bytes_per_lba; uint64_t blba;
uint64_t kbuf_sectors = KBUF_SIZE / blba; uint64_t kbuf_sectors;
uint8_t* kbuf = NULL; uint8_t* kbuf = NULL;
int found_partitions = 0; int found_partitions = 0;
int good_partition = -1; int good_partition = -1;
@@ -126,11 +124,30 @@ int LoadKernel(LoadKernelParams* params) {
uint16_t tpm_kernel_version = 0; uint16_t tpm_kernel_version = 0;
uint64_t lowest_key_version = 0xFFFF; uint64_t lowest_key_version = 0xFFFF;
uint64_t lowest_kernel_version = 0xFFFF; uint64_t lowest_kernel_version = 0xFFFF;
int is_dev = (BOOT_FLAG_DEVELOPER & params->boot_flags ? 1 : 0); int is_dev;
int is_rec = (BOOT_FLAG_RECOVERY & params->boot_flags ? 1 : 0); int is_rec;
int is_normal = (!is_dev && !is_rec); int is_normal;
uint32_t status; uint32_t status;
/* Sanity Checks */
if (!params ||
!params->header_sign_key_blob ||
!params->bytes_per_lba ||
!params->ending_lba ||
!params->kernel_buffer ||
!params->kernel_buffer_size) {
VBDEBUG(("LoadKernel() called with invalid params\n"));
return LOAD_KERNEL_INVALID;
}
/* Initialization */
kernel_subkey = (VbPublicKey*)params->header_sign_key_blob;
blba = params->bytes_per_lba;
kbuf_sectors = KBUF_SIZE / blba;
is_dev = (BOOT_FLAG_DEVELOPER & params->boot_flags ? 1 : 0);
is_rec = (BOOT_FLAG_RECOVERY & params->boot_flags ? 1 : 0);
is_normal = (!is_dev && !is_rec);
/* Clear output params in case we fail */ /* Clear output params in case we fail */
params->partition_number = 0; params->partition_number = 0;
params->bootloader_address = 0; params->bootloader_address = 0;

1
utility/load_kernel_test.c
View File

@@ -117,6 +117,7 @@ int main(int argc, char* argv[]) {
fprintf(stderr, "Unable to allocate kernel buffer.\n"); fprintf(stderr, "Unable to allocate kernel buffer.\n");
return 1; return 1;
} }
lkp.kernel_buffer_size = KERNEL_BUFFER_SIZE;
/* Need to skip the address check, since we're putting it somewhere on the /* Need to skip the address check, since we're putting it somewhere on the
* heap instead of its actual target address in the firmware. */ * heap instead of its actual target address in the firmware. */