Skip to content

L
lxc
Unverified Commit 327cce76 by Christian Brauner
Options

conf: fix run_script_argv()

Make sure that we allocate the buffer **after** we determined how much space we need in total. This fixes a SIGBUS/SIGSEGV Stéphane reported on aarch64 and armf. Reported-by: 's avatarStéphane Graber <stgraber@ubuntu.com> Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 47d4e397
Showing with 5 additions and 7 deletions
src/lxc/conf.c
...@@ -376,8 +376,6 @@ int run_script_argv(const char *name, unsigned int hook_version, ...@@ -376,8 +376,6 @@ int run_script_argv(const char *name, unsigned int hook_version,
if (size > INT_MAX) if (size > INT_MAX)
return -EFBIG; return -EFBIG;
buffer = alloca(size);
if (hook_version == 0) { if (hook_version == 0) {
size += strlen(hookname); size += strlen(hookname);
size++; size++;
...@@ -390,19 +388,19 @@ int run_script_argv(const char *name, unsigned int hook_version, ...@@ -390,19 +388,19 @@ int run_script_argv(const char *name, unsigned int hook_version,
if (size > INT_MAX) if (size > INT_MAX)
return -EFBIG; return -EFBIG;
}
buffer = alloca(size);
if (hook_version == 0)
buf_pos = snprintf(buffer, size, "exec %s %s %s %s", script, name, section, hookname); buf_pos = snprintf(buffer, size, "exec %s %s %s %s", script, name, section, hookname);
if (buf_pos < 0 || (size_t)buf_pos >= size) { else
ERROR("Failed to create command line for script \"%s\"", script);
return -1;
}
} else {
buf_pos = snprintf(buffer, size, "exec %s", script); buf_pos = snprintf(buffer, size, "exec %s", script);
if (buf_pos < 0 || (size_t)buf_pos >= size) { if (buf_pos < 0 || (size_t)buf_pos >= size) {
ERROR("Failed to create command line for script \"%s\"", script); ERROR("Failed to create command line for script \"%s\"", script);
return -1; return -1;
} }
if (hook_version == 1) {
ret = setenv("LXC_HOOK_TYPE", hookname, 1); ret = setenv("LXC_HOOK_TYPE", hookname, 1);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set environment variable: " SYSERROR("Failed to set environment variable: "
......
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