shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-08 21:17:47 +03:00
Code

core/namespace: fix path sorting

Browse Source 
The comparison function we use for qsorting paths is overly indifferent.
Consider these 3 paths for sorting:
 /foo
 /bar
 /foo/foo
qsort() may compare:
 "/foo" with "/bar" => 0, indifference
 "/bar" with "/foo/foo" => 0, indifference
and assume transitively that "/foo" and "/foo/foo" are also indifferent.

But this is wrong, we want "/foo" sorted before "/foo/foo".
The comparison function must be transitive.

Use path_compare(), which behaves properly.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1184016
This commit is contained in:
Michal Schmidt 2015-03-16 22:04:21 +01:00
parent 2230852bd9
commit a0827e2b12
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/namespace.c
View File

@ -83,9 +83,11 @@ static int append_mounts(BindMount **p, char **strv, MountMode mode) {
static int mount_path_compare(const void *a, const void *b) {
const BindMount *p = a, *q = b;
int d;
if (path_equal(p->path, q->path)) {
d = path_compare(p->path, q->path);
if (!d) {
/* If the paths are equal, check the mode */
if (p->mode < q->mode)
return -1;
@ -97,13 +99,7 @@ static int mount_path_compare(const void *a, const void *b) {
}
/* If the paths are not equal, then order prefixes first */
if (path_startswith(p->path, q->path))
return 1;
if (path_startswith(q->path, p->path))
return -1;
return 0;
return d;
}
static void drop_duplicates(BindMount *m, unsigned *n) {