apparmor: Fix failed mount permission check error message

commit b3a77b773da6522d6bd8c532fa6fa3fbcd62d343 upstream.

When the mount check fails due to a permission check failure instead
of explicitly at one of the subcomponent checks, AppArmor is reporting
a failure in the flags match. However this is not true and AppArmor
can not attribute the error at this point to any particular component,
and should only indicate the mount failed due to missing permissions.

Fixes: 650380a97cee ("apparmor: add mount mediation")
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
index 17081c8dbefacae33dd8e84bf19dfefdd2b22bb4..7c8e6d748306216e30112feb73ee34749fb70212 100644 (file)
--- a/security/apparmor/mount.c
+++ b/security/apparmor/mount.c
@@ -229,7 +229,8 @@ static const char * const mnt_info_table[] = {
        "failed srcname match",
        "failed type match",
        "failed flags match",
-       "failed data match"
+       "failed data match",
+       "failed perms check"
 };
 
 /*
@@ -284,8 +285,8 @@ static int do_match_mnt(struct aa_dfa *dfa, unsigned int start,
                        return 0;
        }
 
-       /* failed at end of flags match */
-       return 4;
+       /* failed at perms check, don't confuse with flags match */
+       return 6;
 }