picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cg_path_get_user_unit(): Did not correctly parse user-unit templates. 

It ran either skip_session() or skip_user_manager(), then ran skip_slices()
iff skip_session() ran.  It needs to run skip_slices() in either case.

Included is a test case demonstrating why.
This commit is contained in:
Luke Shumaker 2015-02-03 20:07:37 -05:00 committed by Lennart Poettering
parent 5e07a79e84
commit 3208148114
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/shared/cgroup-util.c
View File

@ -1251,17 +1251,15 @@ int cg_path_get_user_unit(const char *path, char **unit) {
/* Skip slices, if there are any */
e = skip_slices(path);
/* Skip the session scope... */
/* Skip the session scope or user manager... */
t = skip_session(e);
if (t)
/* ... and skip more slices if there's one */
e = skip_slices(t);
else {
/* ... or require a user manager unit to be there */
e = skip_user_manager(e);
if (!e)
return -ENOENT;
}
if (!t)
t = skip_user_manager(e);
if (!t)
return -ENOENT;
/* ... and skip more slices if there are any */
e = skip_slices(t);
return cg_path_decode_unit(e, unit);
}

1
src/test/test-cgroup-util.c
View File

@ -93,6 +93,7 @@ static void test_path_get_user_unit(void) {
check_p_g_u_u("/meh.service", -ENOENT, NULL);
check_p_g_u_u("/session-3.scope/_cpu.service", 0, "cpu.service");
check_p_g_u_u("/user.slice/user-1000.slice/user@1000.service/server.service", 0, "server.service");
check_p_g_u_u("/user.slice/user-1000.slice/user@1000.service/foobar.slice/foobar@pie.service", 0, "foobar@pie.service");
check_p_g_u_u("/user.slice/user-1000.slice/user@.service/server.service", -ENOENT, NULL);
}