summaryrefslogtreecommitdiff
path: root/security/apparmor/domain.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2017-05-29 12:19:39 -0700
committerJohn Johansen <john.johansen@canonical.com>2017-06-10 17:11:30 -0700
commit2d679f3cb0eaa6afa0dc97fe6ad3b797e1c1899a (patch)
treeca5d91a2a68e4354e55115fec21c8dc952440e0e /security/apparmor/domain.c
parentaa9aeea8d4c3dfb9297723c4340671ef88e372d3 (diff)
apparmor: switch from file_perms to aa_perms
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/domain.c')
-rw-r--r--security/apparmor/domain.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index ab8f23cdccff..a0ba33454b8c 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -93,12 +93,12 @@ out:
*
* Returns: permission set
*/
-static struct file_perms change_profile_perms(struct aa_profile *profile,
- struct aa_ns *ns,
- const char *name, u32 request,
- unsigned int start)
+static struct aa_perms change_profile_perms(struct aa_profile *profile,
+ struct aa_ns *ns,
+ const char *name, u32 request,
+ unsigned int start)
{
- struct file_perms perms;
+ struct aa_perms perms;
struct path_cond cond = { };
unsigned int state;
@@ -342,7 +342,7 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
struct aa_ns *ns;
char *buffer = NULL;
unsigned int state;
- struct file_perms perms = {};
+ struct aa_perms perms = {};
struct path_cond cond = {
file_inode(bprm->file)->i_uid,
file_inode(bprm->file)->i_mode
@@ -400,7 +400,7 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
/* find exec permissions for name */
state = aa_str_perms(profile->file.dfa, state, name, &cond, &perms);
if (ctx->onexec) {
- struct file_perms cp;
+ struct aa_perms cp;
info = "change_profile onexec";
new_profile = aa_get_newest_profile(ctx->onexec);
if (!(perms.allow & AA_MAY_ONEXEC))
@@ -609,7 +609,7 @@ int aa_change_hat(const char *hats[], int count, u64 token, bool permtest)
struct aa_profile *profile, *previous_profile, *hat = NULL;
char *name = NULL;
int i;
- struct file_perms perms = {};
+ struct aa_perms perms = {};
const char *target = NULL, *info = NULL;
int error = 0;
@@ -748,7 +748,7 @@ int aa_change_profile(const char *fqname, bool onexec,
{
const struct cred *cred;
struct aa_profile *profile, *target = NULL;
- struct file_perms perms = {};
+ struct aa_perms perms = {};
const char *info = NULL, *op;
int error = 0;
u32 request;