Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 1848b8f8b9be500046ca5d632789a068d6151815 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 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 4 | Subject: [PATCH] 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> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 11 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 12 | --- |
| 13 | src/lib/src/fwts_acpi_tables.c | 4 ++-- |
| 14 | src/lib/src/fwts_mmap.c | 2 +- |
| 15 | src/lib/src/fwts_smbios.c | 4 ++-- |
| 16 | 3 files changed, 5 insertions(+), 5 deletions(-) |
| 17 | |
| 18 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 19 | index 58e982a6..6522032f 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 20 | --- a/src/lib/src/fwts_acpi_tables.c |
| 21 | +++ b/src/lib/src/fwts_acpi_tables.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 22 | @@ -156,7 +156,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr, |
| 23 | return NULL; |
| 24 | } |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 25 | |
| 26 | - if ((mem = fwts_mmap((off_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) |
| 27 | + if ((mem = fwts_mmap((uintptr_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) |
| 28 | return NULL; |
| 29 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 30 | if (fwts_safe_memcpy(rsdp, mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) { |
| 31 | @@ -455,7 +455,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 32 | if ((rsdp = fwts_acpi_get_rsdp(fw, rsdp_addr, &rsdp_len)) == NULL) |
| 33 | return FWTS_ERROR; |
| 34 | |
| 35 | - fwts_acpi_add_table("RSDP", rsdp, (uint64_t)(off_t)rsdp_addr, rsdp_len, FWTS_ACPI_TABLE_FROM_FIRMWARE); |
| 36 | + fwts_acpi_add_table("RSDP", rsdp, (uint64_t)(uintptr_t)rsdp_addr, rsdp_len, FWTS_ACPI_TABLE_FROM_FIRMWARE); |
| 37 | |
| 38 | /* Load any tables from XSDT if it's valid */ |
| 39 | if (rsdp->xsdt_address) { |
| 40 | diff --git a/src/lib/src/fwts_mmap.c b/src/lib/src/fwts_mmap.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 41 | index e28abf87..2180b2cc 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 42 | --- a/src/lib/src/fwts_mmap.c |
| 43 | +++ b/src/lib/src/fwts_mmap.c |
| 44 | @@ -81,7 +81,7 @@ int fwts_munmap(void *mem, const size_t size) |
| 45 | off_t offset; |
| 46 | |
| 47 | page_size = fwts_page_size(); |
| 48 | - offset = ((off_t)(mem)) & (page_size - 1); |
| 49 | + offset = ((uintptr_t)(mem)) & (page_size - 1); |
| 50 | |
| 51 | if (munmap((void *)((uint8_t *)mem - offset), size + offset) < 0) |
| 52 | return FWTS_ERROR; |
| 53 | diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 54 | index e5b3c774..c8134926 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 55 | --- a/src/lib/src/fwts_smbios.c |
| 56 | +++ b/src/lib/src/fwts_smbios.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 57 | @@ -55,7 +55,7 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 58 | fwts_smbios_entry *mapped_entry; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 59 | const size_t size = sizeof(fwts_smbios_entry); |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 60 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 61 | - if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) { |
| 62 | + if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) { |
| 63 | if (fwts_safe_memcpy(entry, mapped_entry, size) == FWTS_OK) { |
| 64 | (void)fwts_munmap(mapped_entry, size); |
| 65 | *type = FWTS_SMBIOS; |
| 66 | @@ -91,7 +91,7 @@ static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_ent |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 67 | fwts_smbios30_entry *mapped_entry; |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 68 | const size_t size = sizeof(fwts_smbios30_entry); |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 69 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 70 | - if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) { |
| 71 | + if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) { |
| 72 | if (fwts_safe_memread(mapped_entry, size) == FWTS_OK) { |
| 73 | *entry = *mapped_entry; |
| 74 | (void)fwts_munmap(mapped_entry, size); |