diff options
Diffstat (limited to 'meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch')
| -rw-r--r-- | meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch b/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch deleted file mode 100644 index bebbfa4ad1..0000000000 --- a/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 1848b8f8b9be500046ca5d632789a068d6151815 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] 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 | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c -index 58e982a6..6522032f 100644 ---- a/src/lib/src/fwts_acpi_tables.c -+++ b/src/lib/src/fwts_acpi_tables.c -@@ -156,7 +156,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) { -@@ -455,7 +455,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 e28abf87..2180b2cc 100644 ---- a/src/lib/src/fwts_mmap.c -+++ b/src/lib/src/fwts_mmap.c -@@ -81,7 +81,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 e5b3c774..c8134926 100644 ---- a/src/lib/src/fwts_smbios.c -+++ b/src/lib/src/fwts_smbios.c -@@ -55,7 +55,7 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * - fwts_smbios_entry *mapped_entry; - const size_t size = sizeof(fwts_smbios_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; -@@ -91,7 +91,7 @@ static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_ent - fwts_smbios30_entry *mapped_entry; - const size_t size = sizeof(fwts_smbios30_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_memread(mapped_entry, size) == FWTS_OK) { - *entry = *mapped_entry; - (void)fwts_munmap(mapped_entry, size); |