proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 09:48:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2221 from tych0/fix-use-after-free

Browse Source 
fix handler use-after-free
This commit is contained in:
Christian Brauner 2018-03-15 16:52:39 +01:00 committed by GitHub
commit 0e83121caa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/execute.c
View File

@ -120,7 +120,7 @@ static struct lxc_operations execute_start_ops = {
int lxc_execute(const char *name, char *const argv[], int quiet, int lxc_execute(const char *name, char *const argv[], int quiet,
struct lxc_handler *handler, const char *lxcpath, struct lxc_handler *handler, const char *lxcpath,
bool backgrounded) bool backgrounded, int *error_num)
{ {
struct execute_args args = {.argv = argv, .quiet = quiet}; struct execute_args args = {.argv = argv, .quiet = quiet};
@ -129,5 +129,5 @@ int lxc_execute(const char *name, char *const argv[], int quiet,
handler->conf->is_execute = 1; handler->conf->is_execute = 1;
return __lxc_start(name, handler, &execute_start_ops, &args, lxcpath, return __lxc_start(name, handler, &execute_start_ops, &args, lxcpath,
backgrounded); backgrounded, error_num);
} }

4
src/lxc/lxc.h
View File

@ -54,7 +54,7 @@ struct lxc_handler;
*/ */
extern int lxc_start(const char *name, char *const argv[], extern int lxc_start(const char *name, char *const argv[],
struct lxc_handler *handler, const char *lxcpath, struct lxc_handler *handler, const char *lxcpath,
bool backgrounded); bool backgrounded, int *error_num);
/* /*
* Start the specified command inside an application container * Start the specified command inside an application container
@ -67,7 +67,7 @@ extern int lxc_start(const char *name, char *const argv[],
*/ */
extern int lxc_execute(const char *name, char *const argv[], int quiet, extern int lxc_execute(const char *name, char *const argv[], int quiet,
struct lxc_handler *handler, const char *lxcpath, struct lxc_handler *handler, const char *lxcpath,
bool backgrounded); bool backgrounded, int *error_num);
/* /*
* Close the fd associated with the monitoring * Close the fd associated with the monitoring

5
src/lxc/lxccontainer.c
View File

@ -1066,10 +1066,9 @@ reboot:
} }
if (useinit) if (useinit)
ret = lxc_execute(c->name, argv, 1, handler, c->config_path, daemonize); ret = lxc_execute(c->name, argv, 1, handler, c->config_path, daemonize, &c->error_num);
else else
ret = lxc_start(c->name, argv, handler, c->config_path, daemonize); ret = lxc_start(c->name, argv, handler, c->config_path, daemonize, &c->error_num);
c->error_num = handler->exit_status;
if (conf->reboot == 1) { if (conf->reboot == 1) {
INFO("Container requested reboot"); INFO("Container requested reboot");

8
src/lxc/start.c
View File

@ -1824,7 +1824,7 @@ out_abort:
int __lxc_start(const char *name, struct lxc_handler *handler, int __lxc_start(const char *name, struct lxc_handler *handler,
struct lxc_operations* ops, void *data, const char *lxcpath, struct lxc_operations* ops, void *data, const char *lxcpath,
bool backgrounded) bool backgrounded, int *error_num)
{ {
int ret, status; int ret, status;
struct lxc_conf *conf = handler->conf; struct lxc_conf *conf = handler->conf;
@ -1920,6 +1920,8 @@ int __lxc_start(const char *name, struct lxc_handler *handler,
lxc_monitor_send_exit_code(name, status, handler->lxcpath); lxc_monitor_send_exit_code(name, status, handler->lxcpath);
lxc_error_set_and_log(handler->pid, status); lxc_error_set_and_log(handler->pid, status);
if (error_num)
*error_num = handler->exit_status;
out_fini: out_fini:
lxc_delete_network(handler); lxc_delete_network(handler);
@ -1965,13 +1967,13 @@ static struct lxc_operations start_ops = {
}; };
int lxc_start(const char *name, char *const argv[], struct lxc_handler *handler, int lxc_start(const char *name, char *const argv[], struct lxc_handler *handler,
const char *lxcpath, bool backgrounded) const char *lxcpath, bool backgrounded, int *error_num)
{ {
struct start_args start_arg = { struct start_args start_arg = {
.argv = argv, .argv = argv,
}; };
return __lxc_start(name, handler, &start_ops, &start_arg, lxcpath, backgrounded); return __lxc_start(name, handler, &start_ops, &start_arg, lxcpath, backgrounded, error_num);
} }
static void lxc_destroy_container_on_signal(struct lxc_handler *handler, static void lxc_destroy_container_on_signal(struct lxc_handler *handler,

3
src/lxc/start.h
View File

@ -165,7 +165,8 @@ extern void lxc_fini(const char *name, struct lxc_handler *handler);
extern int lxc_check_inherited(struct lxc_conf *conf, bool closeall, extern int lxc_check_inherited(struct lxc_conf *conf, bool closeall,
int *fds_to_ignore, size_t len_fds); int *fds_to_ignore, size_t len_fds);
extern int __lxc_start(const char *, struct lxc_handler *, extern int __lxc_start(const char *, struct lxc_handler *,
struct lxc_operations *, void *, const char *, bool); struct lxc_operations *, void *, const char *, bool,
int *);
extern int resolve_clone_flags(struct lxc_handler *handler); extern int resolve_clone_flags(struct lxc_handler *handler);