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

files: Don't access value from stack in outer contex

Browse source 
The struct fd_link link allocated in inner context might be
freed before dump call (depending on compiler), instead
use a safer approach.

Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Cyrill Gorcunov 2017-07-13 00:44:44 +03:00 • committed by Pavel Emelyanov
parent e3311ea37b
commit 245b4b3698
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
criu/files.c
View file

@ -407,8 +407,11 @@ static const struct fdtype_ops *get_mem_dev_ops(struct fd_parms *p, int minor)
static int dump_chrdev(struct fd_parms *p, int lfd, struct cr_img *img)
{
struct fd_link *link_old = p->link;
int maj = major(p->stat.st_rdev);
const struct fdtype_ops *ops;
struct fd_link link;
int err;
switch (maj) {
case MEM_MAJOR:
@ -423,8 +426,6 @@ static int dump_chrdev(struct fd_parms *p, int lfd, struct cr_img *img)
char more[32];
if (is_tty(p->stat.st_rdev, p->stat.st_dev)) {
struct fd_link link;
if (fill_fdlink(lfd, p, &link))
return -1;
p->link = &link;
@ -433,11 +434,15 @@ static int dump_chrdev(struct fd_parms *p, int lfd, struct cr_img *img)
}
sprintf(more, "%d:%d", maj, minor(p->stat.st_rdev));
return dump_unsupp_fd(p, lfd, img, "chr", more);
err = dump_unsupp_fd(p, lfd, img, "chr", more);
p->link = link_old;
return err;
}
}
return do_dump_gen_file(p, lfd, ops, img);
err = do_dump_gen_file(p, lfd, ops, img);
p->link = link_old;
return err;
}
static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,