diff options
Diffstat (limited to 'security/apparmor/include')
-rw-r--r-- | security/apparmor/include/audit.h | 2 | ||||
-rw-r--r-- | security/apparmor/include/file.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h index 4b7e18951aea..69d8cae634e7 100644 --- a/security/apparmor/include/audit.h +++ b/security/apparmor/include/audit.h | |||
@@ -125,7 +125,7 @@ struct apparmor_audit_data { | |||
125 | const char *target; | 125 | const char *target; |
126 | u32 request; | 126 | u32 request; |
127 | u32 denied; | 127 | u32 denied; |
128 | uid_t ouid; | 128 | kuid_t ouid; |
129 | } fs; | 129 | } fs; |
130 | }; | 130 | }; |
131 | }; | 131 | }; |
diff --git a/security/apparmor/include/file.h b/security/apparmor/include/file.h index f98fd4701d80..967b2deda376 100644 --- a/security/apparmor/include/file.h +++ b/security/apparmor/include/file.h | |||
@@ -71,7 +71,7 @@ struct path; | |||
71 | 71 | ||
72 | /* need to make conditional which ones are being set */ | 72 | /* need to make conditional which ones are being set */ |
73 | struct path_cond { | 73 | struct path_cond { |
74 | uid_t uid; | 74 | kuid_t uid; |
75 | umode_t mode; | 75 | umode_t mode; |
76 | }; | 76 | }; |
77 | 77 | ||
@@ -146,7 +146,7 @@ static inline u16 dfa_map_xindex(u16 mask) | |||
146 | 146 | ||
147 | int aa_audit_file(struct aa_profile *profile, struct file_perms *perms, | 147 | int aa_audit_file(struct aa_profile *profile, struct file_perms *perms, |
148 | gfp_t gfp, int op, u32 request, const char *name, | 148 | gfp_t gfp, int op, u32 request, const char *name, |
149 | const char *target, uid_t ouid, const char *info, int error); | 149 | const char *target, kuid_t ouid, const char *info, int error); |
150 | 150 | ||
151 | /** | 151 | /** |
152 | * struct aa_file_rules - components used for file rule permissions | 152 | * struct aa_file_rules - components used for file rule permissions |