Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 1 | From f723458eb649a9ad1d5d0e3dd6e801b284680fa7 Mon Sep 17 00:00:00 2001 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 8 Jun 2017 16:50:59 -0700 |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 4 | Subject: [PATCH 6/6] use intptr_t to fix pointer-to-int-cast issues |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
| 6 | uintptr_t is guaranteed to be wide enough that |
| 7 | converting a void* to uintptr_t and back again |
| 8 | will yield the original pointer value |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | src/lib/src/fwts_acpi_tables.c | 4 ++-- |
| 13 | src/lib/src/fwts_mmap.c | 2 +- |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 14 | src/lib/src/fwts_smbios.c | 2 +- |
| 15 | 3 files changed, 4 insertions(+), 4 deletions(-) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 16 | |
| 17 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 18 | index 4fa1246a..7ef197cd 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19 | --- a/src/lib/src/fwts_acpi_tables.c |
| 20 | +++ b/src/lib/src/fwts_acpi_tables.c |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 21 | @@ -173,7 +173,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr, |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 22 | return NULL; |
| 23 | } |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 24 | |
| 25 | - if ((mem = fwts_mmap((off_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) |
| 26 | + if ((mem = fwts_mmap((uintptr_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) |
| 27 | return NULL; |
| 28 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 29 | if (fwts_safe_memcpy(rsdp, mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) { |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 30 | @@ -486,7 +486,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 31 | if ((rsdp = fwts_acpi_get_rsdp(fw, rsdp_addr, &rsdp_len)) == NULL) |
| 32 | return FWTS_ERROR; |
| 33 | |
| 34 | - fwts_acpi_add_table("RSDP", rsdp, (uint64_t)(off_t)rsdp_addr, rsdp_len, FWTS_ACPI_TABLE_FROM_FIRMWARE); |
| 35 | + fwts_acpi_add_table("RSDP", rsdp, (uint64_t)(uintptr_t)rsdp_addr, rsdp_len, FWTS_ACPI_TABLE_FROM_FIRMWARE); |
| 36 | |
| 37 | /* Load any tables from XSDT if it's valid */ |
| 38 | if (rsdp->xsdt_address) { |
| 39 | diff --git a/src/lib/src/fwts_mmap.c b/src/lib/src/fwts_mmap.c |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 40 | index 2f2514f1..fbd946f4 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 41 | --- a/src/lib/src/fwts_mmap.c |
| 42 | +++ b/src/lib/src/fwts_mmap.c |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 43 | @@ -82,7 +82,7 @@ int fwts_munmap(void *mem, const size_t size) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 44 | off_t offset; |
| 45 | |
| 46 | page_size = fwts_page_size(); |
| 47 | - offset = ((off_t)(mem)) & (page_size - 1); |
| 48 | + offset = ((uintptr_t)(mem)) & (page_size - 1); |
| 49 | |
| 50 | if (munmap((void *)((uint8_t *)mem - offset), size + offset) < 0) |
| 51 | return FWTS_ERROR; |
| 52 | diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 53 | index 8da572e9..04315bd3 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 54 | --- a/src/lib/src/fwts_smbios.c |
| 55 | +++ b/src/lib/src/fwts_smbios.c |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 56 | @@ -78,7 +78,7 @@ static void *fwts_smbios_find_entry_uefi( |
| 57 | if ((addr = fwts_scan_efi_systab(smbios)) != NULL) { |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 58 | fwts_smbios_entry *mapped_entry; |
| 59 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 60 | - if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) { |
| 61 | + if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) { |
| 62 | if (fwts_safe_memcpy(entry, mapped_entry, size) == FWTS_OK) { |
| 63 | (void)fwts_munmap(mapped_entry, size); |
| 64 | *type = FWTS_SMBIOS; |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 65 | -- |
| 66 | 2.25.1 |
| 67 | |