From: Michael Tokarev Date: Tue, 24 Nov 2009 08:47:27 +0000 (+0100) Subject: fix fdleak and errors in lxc_create_tty() X-Git-Tag: lxc_0_6_4~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=985d15b106c8959ff130ba5425c2abbe36dc2cca;p=thirdparty%2Flxc.git fix fdleak and errors in lxc_create_tty() if, for some reason, openpty() fails, lxc_create_tty() will leak all previous ptys and leave the config structure in a inconsistent state (wrt the number of ptys actually opened) Fix that by explicitly closing all previously opened ptys in case of failure and by setting number of actually opened ttys after actual open Signed-off-by: Michael Tokarev Signed-off-by: Daniel Lezcano --- diff --git a/src/lxc/conf.c b/src/lxc/conf.c index abfdb60e6..9c3a558ba 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -995,29 +995,29 @@ int lxc_assign_network(struct lxc_list *network, pid_t pid) int lxc_create_tty(const char *name, struct lxc_conf *conf) { struct lxc_tty_info *tty_info = &conf->tty_info; - int i, ret = -1; + int i; /* no tty in the configuration */ if (!conf->tty) return 0; - tty_info->nbtty = conf->tty; tty_info->pty_info = malloc(sizeof(*tty_info->pty_info)*tty_info->nbtty); - if (!tty_info->pty_info) { SYSERROR("failed to allocate pty_info"); - goto out; + return -1; } - for (i = 0; i < tty_info->nbtty; i++) { + for (i = 0; i < conf->tty; i++) { struct lxc_pty_info *pty_info = &tty_info->pty_info[i]; if (openpty(&pty_info->master, &pty_info->slave, pty_info->name, NULL, NULL)) { SYSERROR("failed to create pty #%d", i); - goto out_free; + tty_info->nbtty = i; + lxc_delete_tty(tty_info); + return -1; } /* Prevent leaking the file descriptors to the container */ @@ -1027,16 +1027,11 @@ int lxc_create_tty(const char *name, struct lxc_conf *conf) pty_info->busy = 0; } - ret = 0; + tty_info->nbtty = conf->tty; INFO("tty's configured"); -out: - return ret; - -out_free: - free(tty_info->pty_info); - goto out; + return 0; } void lxc_delete_tty(struct lxc_tty_info *tty_info)