summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2015-03-16 22:04:21 +0100
committerMichal Schmidt <mschmidt@redhat.com>2015-03-16 22:17:15 +0100
commita0827e2b123010c46cfe4f03eebba57d92f9efc4 (patch)
tree99610ff3e46d55482771b3c2aeeb18fe5a8d94d6 /src/core
parent2230852bd9755e1b7bfd1260082471f559b0a005 (diff)
core/namespace: fix path sorting
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
Diffstat (limited to 'src/core')
-rw-r--r--src/core/namespace.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 4a412a249..f8a2bbc81 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -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) {