Commit d47434ab authored by Chanho Park's avatar Chanho Park Committed by Pavel Emelyanov

pie: use 'unsigned long' instead u64

Sys_mmap returns 'unsigned long' value. Contrary to x64, ARM has 32bit size of
'unsigned long'. If sys_mmap returns 32bit value, higher 32bit will be filled
0xffffffff.
Signed-off-by: 's avatarChanho Park <chanho61.park@samsung.com>
Signed-off-by: 's avatarMyungjoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 88524cf5
...@@ -328,11 +328,11 @@ static long restore_self_exe_late(struct task_restore_core_args *args) ...@@ -328,11 +328,11 @@ static long restore_self_exe_late(struct task_restore_core_args *args)
return 0; return 0;
} }
static u64 restore_mapping(const VmaEntry *vma_entry) static unsigned long restore_mapping(const VmaEntry *vma_entry)
{ {
int prot = vma_entry->prot; int prot = vma_entry->prot;
int flags = vma_entry->flags | MAP_FIXED; int flags = vma_entry->flags | MAP_FIXED;
u64 addr; unsigned long addr;
if (vma_entry_is(vma_entry, VMA_AREA_SYSVIPC)) if (vma_entry_is(vma_entry, VMA_AREA_SYSVIPC))
return sys_shmat(vma_entry->fd, decode_pointer(vma_entry->start), return sys_shmat(vma_entry->fd, decode_pointer(vma_entry->start),
...@@ -484,7 +484,7 @@ long __export_restore_task(struct task_restore_core_args *args) ...@@ -484,7 +484,7 @@ long __export_restore_task(struct task_restore_core_args *args)
{ {
long ret = -1; long ret = -1;
VmaEntry *vma_entry; VmaEntry *vma_entry;
u64 va; unsigned long va;
unsigned long premmapped_end = args->premmapped_addr + args->premmapped_len; unsigned long premmapped_end = args->premmapped_addr + args->premmapped_len;
struct rt_sigframe *rt_sigframe; struct rt_sigframe *rt_sigframe;
...@@ -626,7 +626,7 @@ long __export_restore_task(struct task_restore_core_args *args) ...@@ -626,7 +626,7 @@ long __export_restore_task(struct task_restore_core_args *args)
va = restore_mapping(vma_entry); va = restore_mapping(vma_entry);
if (va != vma_entry->start) { if (va != vma_entry->start) {
pr_err("Can't restore %"PRIx64" mapping with %"PRIx64"\n", vma_entry->start, va); pr_err("Can't restore %"PRIx64" mapping with %lx\n", vma_entry->start, va);
goto core_restore_end; goto core_restore_end;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment