Commit e9603d7f authored by John Johansen's avatar John Johansen Committed by Kamal Mostafa

UBUNTU: SAUCE: apparmor: profiles in one ns can affect mediation in another ns

When the ns hierarchy a//foo and b//foo are compared the are
incorrectly identified as being the same as they have the same depth
and the same basename.

Instead make sure to compare the full hname to distinguish this case.

BugLink: http://bugs.launchpad.net/bugs/1615887Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
Acked-by: default avatarTim Gardner <tim.gardner@canonical.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent ea066a90
...@@ -112,8 +112,8 @@ static int ns_cmp(struct aa_ns *a, struct aa_ns *b) ...@@ -112,8 +112,8 @@ static int ns_cmp(struct aa_ns *a, struct aa_ns *b)
AA_BUG(!a); AA_BUG(!a);
AA_BUG(!b); AA_BUG(!b);
AA_BUG(!a->base.name); AA_BUG(!a->base.hname);
AA_BUG(!b->base.name); AA_BUG(!b->base.hname);
if (a == b) if (a == b)
return 0; return 0;
...@@ -122,7 +122,7 @@ static int ns_cmp(struct aa_ns *a, struct aa_ns *b) ...@@ -122,7 +122,7 @@ static int ns_cmp(struct aa_ns *a, struct aa_ns *b)
if (res) if (res)
return res; return res;
return strcmp(a->base.name, b->base.name); return strcmp(a->base.hname, b->base.hname);
} }
/** /**
......
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