Skip to content

Commit

Permalink
coverity: #1425862
Browse files Browse the repository at this point in the history
initialize handler

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Dec 17, 2017
1 parent 68c9b0a commit 63efabe
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/lxc/criu.c
Expand Up @@ -1145,6 +1145,8 @@ static bool do_dump(struct lxc_container *c, char *mode, struct migrate_opts *op

close(criuout[0]);

lxc_zero_handler(&h);

h.name = c->name;
if (!cgroup_init(&h)) {
ERROR("failed to cgroup_init()");
Expand Down
25 changes: 25 additions & 0 deletions src/lxc/start.c
Expand Up @@ -505,6 +505,31 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
return -1;
}

void lxc_zero_handler(struct lxc_handler *handler)
{
int i;

memset(handler, 0, sizeof(struct lxc_handler));

handler->clone_flags = -1;

handler->pinfd = -1;

handler->sigfd = -1;

for (i = 0; i < LXC_NS_MAX; i++)
handler->nsfd[i] = -1;

handler->data_sock[0] = -1;
handler->data_sock[1] = -1;

handler->state_socket_pair[0] = -1;
handler->state_socket_pair[1] = -1;

handler->sync_sock[0] = -1;
handler->sync_sock[1] = -1;
}

void lxc_free_handler(struct lxc_handler *handler)
{
if (handler->conf && handler->conf->maincmd_fd)
Expand Down
1 change: 1 addition & 0 deletions src/lxc/start.h
Expand Up @@ -125,6 +125,7 @@ extern struct lxc_handler *lxc_init_handler(const char *name,
struct lxc_conf *conf,
const char *lxcpath,
bool daemonize);
extern void lxc_zero_handler(struct lxc_handler *handler);
extern void lxc_free_handler(struct lxc_handler *handler);
extern int lxc_init(const char *name, struct lxc_handler *handler);
extern void lxc_fini(const char *name, struct lxc_handler *handler);
Expand Down

0 comments on commit 63efabe

Please sign in to comment.