Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm: fix unsigned/signed mismatch errors related to __calc_tpm2_event_size

Browse Source 
__calc_tpm2_event_size returns 0 or a positive length, but return values
are often interpreted as ints.  Convert everything over to u32 to avoid
signed/unsigned logic errors.

Signed-off-by: Gregory Price <gourry@gourry.net>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Gregory Price 2024-09-13 19:19:53 -04:00 committed by Ard Biesheuvel
parent c33c28f9f6
commit a066397e8e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/firmware/efi/libstub/tpm.c
View File

@ -57,7 +57,7 @@ static void efi_retrieve_tcg2_eventlog(int version, efi_physical_addr_t log_loca
struct linux_efi_tpm_eventlog *log_tbl = NULL; struct linux_efi_tpm_eventlog *log_tbl = NULL;
unsigned long first_entry_addr, last_entry_addr; unsigned long first_entry_addr, last_entry_addr;
size_t log_size, last_entry_size; size_t log_size, last_entry_size;
int final_events_size = 0; u32 final_events_size = 0;
first_entry_addr = (unsigned long) log_location; first_entry_addr = (unsigned long) log_location;
@ -110,9 +110,9 @@ static void efi_retrieve_tcg2_eventlog(int version, efi_physical_addr_t log_loca
*/ */
if (final_events_table && final_events_table->nr_events) { if (final_events_table && final_events_table->nr_events) {
struct tcg_pcr_event2_head *header; struct tcg_pcr_event2_head *header;
int offset; u32 offset;
void *data; void *data;
int event_size; u32 event_size;
int i = final_events_table->nr_events; int i = final_events_table->nr_events;
data = (void *)final_events_table; data = (void *)final_events_table;

2
drivers/firmware/efi/tpm.c
View File

@ -19,7 +19,7 @@ EXPORT_SYMBOL(efi_tpm_final_log_size);
static int __init tpm2_calc_event_log_size(void *data, int count, void *size_info) static int __init tpm2_calc_event_log_size(void *data, int count, void *size_info)
{ {
struct tcg_pcr_event2_head *header; struct tcg_pcr_event2_head *header;
int event_size, size = 0; u32 event_size, size = 0;
while (count > 0) { while (count > 0) {
header = data + size; header = data + size;

2
include/linux/tpm_eventlog.h
View File

@ -157,7 +157,7 @@ struct tcg_algorithm_info {
* Return: size of the event on success, 0 on failure * Return: size of the event on success, 0 on failure
*/ */
static __always_inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event, static __always_inline u32 __calc_tpm2_event_size(struct tcg_pcr_event2_head *event,
struct tcg_pcr_event *event_header, struct tcg_pcr_event *event_header,
bool do_mapping) bool do_mapping)
{ {