UBUNTU: SAUCE: apparmor: add label data availability to the feature set

gsettings mediation needs to be able to determine if apparmor supports
label data queries. A label data query can be done to test for support
but its failure is indistinguishable from other failures, making it an
unreliable indicator.

Fix by making support of label data queries available as a flag in the
apparmorfs features dir tree.

BugLink: http://bugs.launchpad.net/bugs/1678023
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 7147b33a5effc5f2f68f4f33c71c85f25514539a..2ae58fd5c116e849c7156f285ec062112e98525a 100644 (file)
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1568,6 +1568,7 @@ static struct aa_fs_entry aa_fs_entry_dbus[] = {
 
 static struct aa_fs_entry aa_fs_entry_query_label[] = {
        AA_FS_FILE_STRING("perms", "allow deny audit quiet"),
+       AA_FS_FILE_BOOLEAN("data",              1),
        { }
 };