Skip to content

L
lxc
Unverified Commit 386e6768 by Christian Brauner
Options

conf: ensure lxc_delete_tty() does not crash

We need to make sure that the ttys are actually initialized otherwise deleting them is not safe. Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent f3815517
Showing with 14 additions and 2 deletions
src/lxc/conf.c
...@@ -968,6 +968,8 @@ int lxc_allocate_ttys(const char *name, struct lxc_conf *conf) ...@@ -968,6 +968,8 @@ int lxc_allocate_ttys(const char *name, struct lxc_conf *conf)
for (i = 0; i < ttys->max; i++) { for (i = 0; i < ttys->max; i++) {
struct lxc_terminal_info *tty = &ttys->tty[i]; struct lxc_terminal_info *tty = &ttys->tty[i];
tty->master = -EBADF;
tty->slave = -EBADF;
ret = openpty(&tty->master, &tty->slave, ret = openpty(&tty->master, &tty->slave,
tty->name, NULL, NULL); tty->name, NULL, NULL);
if (ret) { if (ret) {
...@@ -1004,11 +1006,21 @@ void lxc_delete_tty(struct lxc_tty_info *ttys) ...@@ -1004,11 +1006,21 @@ void lxc_delete_tty(struct lxc_tty_info *ttys)
{ {
int i; int i;
if (!ttys->tty)
return;
for (i = 0; i < ttys->max; i++) { for (i = 0; i < ttys->max; i++) {
struct lxc_terminal_info *tty = &ttys->tty[i]; struct lxc_terminal_info *tty = &ttys->tty[i];
close(tty->master); if (tty->master >= 0) {
close(tty->slave); close(tty->master);
tty->master = -EBADF;
}
if (tty->slave >= 0) {
close(tty->slave);
tty->slave = -EBADF;
}
} }
free(ttys->tty); free(ttys->tty);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment