shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

systemctl: fix invalid free when enabling sysv services fails

Browse Source 
The error was introduced in v215-343-g60731f32f1 'systemctl: do not
bother to mutate state on error', by causing strv_free to attempt to
free a static string. Simplify the whole thing by always keeping the
array in valid state.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-12-09 14:41:24 -05:00
parent 4dfb18922d
commit a644abed54
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/systemctl/systemctl.c
View File

@ -5143,7 +5143,7 @@ static int enable_sysv_units(const char *verb, char **args) {
int r = 0;
#if defined(HAVE_SYSV_COMPAT) && defined(HAVE_CHKCONFIG)
unsigned f = 1, t = 1;
unsigned f = 0;
_cleanup_lookup_paths_free_ LookupPaths paths = {};
if (arg_scope != UNIT_FILE_SYSTEM)
@ -5162,7 +5162,7 @@ static int enable_sysv_units(const char *verb, char **args) {
return r;
r = 0;
for (f = 0; args[f]; f++) {
while (args[f]) {
const char *name;
_cleanup_free_ char *p = NULL, *q = NULL, *l = NULL;
bool found_native = false, found_sysv;
@ -5173,7 +5173,7 @@ static int enable_sysv_units(const char *verb, char **args) {
pid_t pid;
siginfo_t status;
name = args[f];
name = args[f++];
if (!endswith(name, ".service"))
continue;
@ -5205,9 +5205,6 @@ static int enable_sysv_units(const char *verb, char **args) {
if (!found_sysv)
continue;
/* Mark this entry, so that we don't try enabling it as native unit */
args[f] = (char*) "";
log_info("%s is not a native service, redirecting to /sbin/chkconfig.", name);
if (!isempty(arg_root))
@ -5256,19 +5253,12 @@ static int enable_sysv_units(const char *verb, char **args) {
return -EINVAL;
} else
return -EPROTO;
/* Remove this entry, so that we don't try enabling it as native unit */
assert(f > 0 && streq(args[f-1], name));
assert_se(strv_remove(args + f - 1, name));
}
/* Drop all SysV units */
for (f = 0, t = 0; args[f]; f++) {
if (isempty(args[f]))
continue;
args[t++] = args[f];
}
args[t] = NULL;
#endif
return r;
}