Skip to content

Revert "Get root of trust from tee TPM" and "Revert "fix coverity issue for Boot in kernelflinger - 2" #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AmanBh0709 wants to merge 2 commits into
base: celadon/u/mr0/master
Choose a base branch
from
Open

Revert "Get root of trust from tee TPM" and "Revert "fix coverity issue for Boot in kernelflinger - 2" #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3712998
Revert "fix coverity issue for Boot in kernelflinger - 2"
AmanBh0709 Oct 24, 2024
41978ca
Revert "Get root of trust from tee TPM"
AmanBh0709 Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion kernelflinger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,13 +1212,15 @@ static EFI_STATUS load_image(VOID *bootimage, VOID *vendorbootimage, UINT8 boot_
efi_perror(ret, L"Failed to set os secure boot");
#endif

if (tee_tpm && is_bootimg_target(boot_target)) {
#ifdef USE_IVSHMEM
if (is_bootimg_target(boot_target)) {
ret = ivsh_send_rot_data(bootimage, boot_state, vb_data);
if (EFI_ERROR(ret)) {
debug(L"Unable to send the root of trust data to optee");
die();
}
}
#endif

/* install acpi tables before starting trusty */
ret = setup_acpi_table(bootimage, boot_target);
Expand Down
3 changes: 2 additions & 1 deletion libadb/reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ static EFI_STATUS vmcore_build_header(reader_ctx_t *ctx, void *priv_p)

if (priv->m.end && end > priv->m.end) {
length -= end - priv->m.end;
end = priv->m.end;
}

priv->hdr.phnum++;
Expand Down Expand Up @@ -580,7 +581,7 @@ static EFI_STATUS vmcore_read(reader_ctx_t *ctx, unsigned char **buf, UINT64 *le

/* Start new memory region */
if (priv->m.cur == priv->m.cur_end) {
if (priv->cur_phdr >= priv->hdr.phnum - 1) {
if (priv->cur_phdr == priv->hdr.phnum - 1) {
error(L"Invalid parameter in %a", __func__);
return EFI_INVALID_PARAMETER;
}
Expand Down
2 changes: 0 additions & 2 deletions libfastboot/flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,12 +659,10 @@ EFI_STATUS erase_by_label(CHAR16 *label)
if (!CompareGuid(&p_gparti->part.type, &EfiPartTypeSystemPartitionGuid))
return gpt_refresh();

#ifdef USER
if (is_data)
userdata_erased = TRUE;
if (is_share_data)
share_data_erased = TRUE;
#endif

return EFI_SUCCESS;
}
Expand Down
2 changes: 1 addition & 1 deletion libkernelflinger/fatfs/source/ff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5171,7 +5171,7 @@ FRESULT f_mkdir (
res = sync_fs(fs);
}
} else {
res = remove_chain(&sobj, dcl, 0); /* Could not register, remove the allocated cluster */
remove_chain(&sobj, dcl, 0); /* Could not register, remove the allocated cluster */
}
}
FREE_NAMBUF();
Expand Down