From f723458eb649a9ad1d5d0e3dd6e801b284680fa7 Mon Sep 17 00:00:00 2001
|
From: Khem Raj <raj.khem@gmail.com>
|
Date: Thu, 8 Jun 2017 16:50:59 -0700
|
Subject: [PATCH 6/6] use intptr_t to fix pointer-to-int-cast issues
|
|
uintptr_t is guaranteed to be wide enough that
|
converting a void* to uintptr_t and back again
|
will yield the original pointer value
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
---
|
src/lib/src/fwts_acpi_tables.c | 4 ++--
|
src/lib/src/fwts_mmap.c | 2 +-
|
src/lib/src/fwts_smbios.c | 2 +-
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
|
index 4fa1246a..7ef197cd 100644
|
--- a/src/lib/src/fwts_acpi_tables.c
|
+++ b/src/lib/src/fwts_acpi_tables.c
|
@@ -173,7 +173,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr,
|
return NULL;
|
}
|
|
- if ((mem = fwts_mmap((off_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED)
|
+ if ((mem = fwts_mmap((uintptr_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED)
|
return NULL;
|
|
if (fwts_safe_memcpy(rsdp, mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) {
|
@@ -486,7 +486,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw)
|
if ((rsdp = fwts_acpi_get_rsdp(fw, rsdp_addr, &rsdp_len)) == NULL)
|
return FWTS_ERROR;
|
|
- fwts_acpi_add_table("RSDP", rsdp, (uint64_t)(off_t)rsdp_addr, rsdp_len, FWTS_ACPI_TABLE_FROM_FIRMWARE);
|
+ fwts_acpi_add_table("RSDP", rsdp, (uint64_t)(uintptr_t)rsdp_addr, rsdp_len, FWTS_ACPI_TABLE_FROM_FIRMWARE);
|
|
/* Load any tables from XSDT if it's valid */
|
if (rsdp->xsdt_address) {
|
diff --git a/src/lib/src/fwts_mmap.c b/src/lib/src/fwts_mmap.c
|
index 2f2514f1..fbd946f4 100644
|
--- a/src/lib/src/fwts_mmap.c
|
+++ b/src/lib/src/fwts_mmap.c
|
@@ -82,7 +82,7 @@ int fwts_munmap(void *mem, const size_t size)
|
off_t offset;
|
|
page_size = fwts_page_size();
|
- offset = ((off_t)(mem)) & (page_size - 1);
|
+ offset = ((uintptr_t)(mem)) & (page_size - 1);
|
|
if (munmap((void *)((uint8_t *)mem - offset), size + offset) < 0)
|
return FWTS_ERROR;
|
diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c
|
index 8da572e9..04315bd3 100644
|
--- a/src/lib/src/fwts_smbios.c
|
+++ b/src/lib/src/fwts_smbios.c
|
@@ -78,7 +78,7 @@ static void *fwts_smbios_find_entry_uefi(
|
if ((addr = fwts_scan_efi_systab(smbios)) != NULL) {
|
fwts_smbios_entry *mapped_entry;
|
|
- if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) {
|
+ if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) {
|
if (fwts_safe_memcpy(entry, mapped_entry, size) == FWTS_OK) {
|
(void)fwts_munmap(mapped_entry, size);
|
*type = FWTS_SMBIOS;
|
--
|
2.25.1
|
