mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 07:45:17 +00:00
Code Issues Releases Wiki Activity

fdinfo: Sanitize types in fdinfo_entry

Browse Source 
The namelen is u16, to cover the PATH_MAX u8 is not enough.
The pos is u64, since file offset is that long indeed.
The id is u32 as per previous patch.

Fix printf-s respectively.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2012-03-25 13:48:22 +04:00
parent af57e42e03
commit 159d3bdfd5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cr-show.c
View File

@@ -83,8 +83,8 @@ static void show_files(int fd_files)
if (ret <= 0) if (ret <= 0)
goto out; goto out;
pr_msg("type: %s flags: %4x pos: %8x " pr_msg("type: %s flags: %4x pos: %lx "
"addr: %16lx id: %8lx", "addr: %16lx id: %8x",
fdtype2s(e.type), e.flags, e.pos, e.addr, e.id); fdtype2s(e.type), e.flags, e.pos, e.addr, e.id);
if (e.len) { if (e.len) {

2
files.c
View File

@@ -76,7 +76,7 @@ static int collect_fd(int pid, struct fdinfo_entry *e)
struct fdinfo_list_entry *le = &fdinfo_list[nr_fdinfo_list]; struct fdinfo_list_entry *le = &fdinfo_list[nr_fdinfo_list];
struct fdinfo_desc *desc; struct fdinfo_desc *desc;
pr_info("Collect fdinfo pid=%d fd=%ld id=%16lx\n", pr_info("Collect fdinfo pid=%d fd=%ld id=%16x\n",
pid, e->addr, e->id); pid, e->addr, e->id);
nr_fdinfo_list++; nr_fdinfo_list++;

6
include/image.h
View File

@@ -46,11 +46,11 @@ enum fd_types {
struct fdinfo_entry { struct fdinfo_entry {
u8 type; u8 type;
u8 len; u16 len;
u16 flags; u16 flags;
u32 pos; u64 pos;
u64 addr; u64 addr;
u64 id; u32 id;
u8 name[0]; u8 name[0];
} __packed; } __packed;