Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-24 02:29:23 +00:00
Code Issues Projects Releases Wiki Activity

pie/vdso: convert (char *mem) to (uintptr_t mem)

Browse source 
Impact: drop additional casts all around. Cleanup.

Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Dmitry Safonov 2016-03-30 18:12:25 +03:00 • committed by Pavel Emelyanov
parent 3bf85ce939
commit 7ec96efe3c
6 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
criu/include/parasite-vdso.h
View file

@ -80,7 +80,6 @@ static inline bool is_vdso_mark(void *addr)
}
extern int vdso_do_park(struct vdso_symtable *sym_rt, unsigned long park_at, unsigned long park_size);
extern int vdso_fill_symtable(char *mem, size_t size, struct vdso_symtable *t);
extern int vdso_proxify(char *who, struct vdso_symtable *sym_rt,
unsigned long vdso_rt_parked_at, size_t index,
VmaEntry *vmas, size_t nr_vmas);

2
criu/include/util-vdso.h
View file

@ -88,6 +88,6 @@ static inline unsigned long vvar_vma_size(struct vdso_symtable *t)
return t->vvar_end - t->vvar_start;
}
extern int vdso_fill_symtable(char *mem, size_t size, struct vdso_symtable *t);
extern int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t);
#endif /* __CR_UTIL_VDSO_H__ */

3
criu/pie/parasite-vdso.c
View file

@ -105,7 +105,8 @@ int vdso_proxify(char *who, struct vdso_symtable *sym_rt,
/*
* Find symbols in vDSO zone read from image.
*/
if (vdso_fill_symtable((void *)vma_vdso->start, vma_entry_len(vma_vdso), &s))
if (vdso_fill_symtable((uintptr_t)vma_vdso->start,
vma_entry_len(vma_vdso), &s))
return -1;
/*

2
criu/pie/parasite.c
View file

@ -523,7 +523,7 @@ static int parasite_check_vdso_mark(struct parasite_vdso_vma_entry *args)
if (args->try_fill_symtable) {
struct vdso_symtable t;
if (vdso_fill_symtable((void *)args->start, args->len, &t))
if (vdso_fill_symtable(args->start, args->len, &t))
args->is_vdso = false;
else
args->is_vdso = true;

15
criu/pie/util-vdso.c
View file

@ -25,9 +25,8 @@
#define LOG_PREFIX "vdso: "
/* Check if pointer is out-of-bound */
static bool __ptr_oob(uintptr_t ptr, void *mem, size_t size)
static bool __ptr_oob(uintptr_t ptr, uintptr_t start, size_t size)
{
uintptr_t start = (uintptr_t)mem;
uintptr_t end = start + size;
return ptr > end || ptr < start;
@ -77,7 +76,7 @@ static int has_elf_identity(Ehdr_t *ehdr)
return true;
}
int vdso_fill_symtable(char *mem, size_t size, struct vdso_symtable *t)
int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t)
{
const char *vdso_symbols[VDSO_SYMBOL_MAX] = {
ARCH_VDSO_SYMBOLS
@ -113,7 +112,7 @@ int vdso_fill_symtable(char *mem, size_t size, struct vdso_symtable *t)
/*
* We need PT_LOAD and PT_DYNAMIC here. Each once.
*/
addr = (uintptr_t)mem + ehdr->e_phoff;
addr = mem + ehdr->e_phoff;
for (i = 0; i < ehdr->e_phnum; i++, addr += sizeof(Phdr_t)) {
if (__ptr_oob(addr, mem, size))
goto err_oob;
@ -147,7 +146,7 @@ int vdso_fill_symtable(char *mem, size_t size, struct vdso_symtable *t)
* Dynamic section tags should provide us the rest of information
* needed. Note that we're interested in a small set of tags.
*/
addr = (uintptr_t)mem + dynamic->p_offset;
addr = mem + dynamic->p_offset;
for (i = 0; i < dynamic->p_filesz / sizeof(*d);
i++, addr += sizeof(Dyn_t)) {
if (__ptr_oob(addr, mem, size))
@ -179,12 +178,12 @@ int vdso_fill_symtable(char *mem, size_t size, struct vdso_symtable *t)
return -EINVAL;
}
addr = (uintptr_t)mem + dyn_strtab->d_un.d_val - load->p_vaddr;
addr = mem + dyn_strtab->d_un.d_val - load->p_vaddr;
if (__ptr_oob(addr, mem, size))
goto err_oob;
dynsymbol_names = (void *)addr;
addr = (uintptr_t)mem + dyn_hash->d_un.d_ptr - load->p_vaddr;
addr = mem + dyn_hash->d_un.d_ptr - load->p_vaddr;
if (__ptr_oob(addr, mem, size))
goto err_oob;
hash = (void *)addr;
@ -202,7 +201,7 @@ int vdso_fill_symtable(char *mem, size_t size, struct vdso_symtable *t)
k = elf_hash((const unsigned char *)symbol);
for (j = bucket[k % nbucket]; j < nchain && chain[j] != STN_UNDEF; j = chain[j]) {
addr = (uintptr_t)mem + dyn_symtab->d_un.d_ptr - load->p_vaddr;
addr = mem + dyn_symtab->d_un.d_ptr - load->p_vaddr;
Sym_t *sym;
char *name;

2
criu/vdso.c
View file

@ -257,7 +257,7 @@ static int vdso_fill_self_symtable(struct vdso_symtable *s)
s->vma_start = start;
s->vma_end = end;
ret = vdso_fill_symtable((void *)start, end - start, s);
ret = vdso_fill_symtable(start, end - start, s);
if (ret)
goto err;
} else {