From: John Johansen Date: Tue, 25 Jan 2022 08:37:42 +0000 (-0800) Subject: apparmor: Fix failed mount permission check error message X-Git-Tag: v6.1-rc5~634^2~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec240b5905bbb09a03dccffee03062cf39e38dc2;p=platform%2Fkernel%2Flinux-starfive.git apparmor: Fix failed mount permission check error message 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: 2ea3ffb7782a ("apparmor: add mount mediation") Signed-off-by: John Johansen --- diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c index aa6fcfd..23aafe68 100644 --- 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; }