mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 13:58:34 +00:00
Code Issues Releases Wiki Activity

auxv: Restore backward compatibility

Browse Source 
In commit 459828b6 I suddenly broke backward
compatibility of auxv vector on 32bit machines.
Bring it back.

Reported-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Cyrill Gorcunov 2014-02-10 16:17:37 +04:00 committed by Pavel Emelyanov
parent 66ab5e1ad8
commit ac03ca5599
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cr-dump.c
View File

@ -377,7 +377,8 @@ static int check_sysvipc_map_dump(pid_t pid, VmaEntry *vma)
static int get_task_auxv(pid_t pid, MmEntry *mm) static int get_task_auxv(pid_t pid, MmEntry *mm)
{ {
int fd, ret; auxv_t mm_saved_auxv[AT_VECTOR_SIZE];
int fd, i, ret;
pr_info("Obtaining task auvx ...\n"); pr_info("Obtaining task auvx ...\n");
@ -385,13 +386,16 @@ static int get_task_auxv(pid_t pid, MmEntry *mm)
if (fd < 0) if (fd < 0)
return -1; return -1;
ret = read(fd, mm->mm_saved_auxv, pb_repeated_size(mm, mm_saved_auxv)); ret = read(fd, mm_saved_auxv, sizeof(mm_saved_auxv));
if (ret < 0) { if (ret < 0) {
ret = -1; ret = -1;
pr_perror("Error reading %d's auxv", pid); pr_perror("Error reading %d's auxv", pid);
goto err; goto err;
} else } else {
mm->n_mm_saved_auxv = ret / sizeof(mm->mm_saved_auxv[0]); mm->n_mm_saved_auxv = ret / sizeof(auxv_t);
for (i = 0; i < mm->n_mm_saved_auxv; i++)
mm->mm_saved_auxv[i] = (u64)mm_saved_auxv[i];
}
ret = 0; ret = 0;
err: err: