mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 01:51:51 +00:00
Code Issues Releases Wiki Activity

inotify: Sanitize inotify + inotify_wd collecting

Browse Source 
Add fdesc at once, don't init list we're about to add
and use single fd variable.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov 2012-07-24 10:22:37 +04:00
parent 2b2a40a20d
commit 95c593a618
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
inotify.c
View File

@ -217,7 +217,7 @@ int collect_inotify(void)
{ {
struct inotify_file_info *info; struct inotify_file_info *info;
struct inotify_wd_info *mark; struct inotify_wd_info *mark;
int image_fd = -1, image_wd = -1, ret = -1; int image_fd = -1, ret = -1;
image_fd = open_image_ro(CR_FD_INOTIFY); image_fd = open_image_ro(CR_FD_INOTIFY);
if (image_fd < 0) if (image_fd < 0)
@ -234,16 +234,18 @@ int collect_inotify(void)
else if (!ret) else if (!ret)
break; break;
INIT_LIST_HEAD(&info->list);
INIT_LIST_HEAD(&info->marks); INIT_LIST_HEAD(&info->marks);
list_add(&info->list, &info_head); list_add(&info->list, &info_head);
file_desc_add(&info->d, info->ife->id, &desc_ops);
pr_info("Collected inotify: id 0x%08x flags 0x%08x\n", info->ife->id, info->ife->flags);
} }
close_safe(&image_fd);
ret = -1; ret = -1;
image_wd = open_image_ro(CR_FD_INOTIFY_WD); image_fd = open_image_ro(CR_FD_INOTIFY_WD);
if (image_wd < 0) if (image_fd < 0)
goto err; goto err;
while (1) { while (1) {
@ -252,7 +254,7 @@ int collect_inotify(void)
if (!mark) if (!mark)
goto err; goto err;
ret = pb_read_eof(image_wd, &mark->iwe, inotify_wd_entry); ret = pb_read_eof(image_fd, &mark->iwe, inotify_wd_entry);
if (ret < 0) if (ret < 0)
goto err; goto err;
else if (!ret) else if (!ret)
@ -265,13 +267,8 @@ int collect_inotify(void)
} }
} }
list_for_each_entry(info, &info_head, list) {
pr_info("Collected inotify: id 0x%08x flags 0x%08x\n", info->ife->id, info->ife->flags);
file_desc_add(&info->d, info->ife->id, &desc_ops);
}
ret = 0; ret = 0;
err: err:
close_safe(&image_wd);
close_safe(&image_fd); close_safe(&image_fd);
return ret; return ret;