Commit e844fe9b authored by John Johansen's avatar John Johansen
Browse files

apparmor: convert policy lookup to use accept as an index 



Remap polidydb dfa accept table from embedded perms to an index, and
then move the perm lookup to use the accept entry as an index into the
perm table. This is done so that the perm table can be separated from
the dfa, allowing dfa accept to index to share expanded permission
sets.

Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent bf690f59

security/apparmor/apparmorfs.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static void profile_query_cb(struct aa_profile *profile, struct aa_perms *perms, 
		state = aa_dfa_match_len(dfa, profile->policy.start[0],

					 match_str, match_len);

		if (state)

			tmp = *aa_lookup_perms(profile->policy.perms, state);

			tmp = *aa_lookup_perms(&profile->policy, state);

	}

	aa_apply_modes_to_perms(profile, &tmp);

	aa_perms_accum_raw(perms, &tmp);

security/apparmor/include/perms.h

+0 −8
Original line number Diff line number Diff line
@@ -132,14 +132,6 @@ extern struct aa_perms allperms; 


extern struct aa_perms default_perms;



static inline struct aa_perms *aa_lookup_perms(struct aa_perms *perms,

					       unsigned int state)

{

	if (!(perms))

		return &default_perms;



	return &(perms[state]);

}



void aa_perm_mask_to_str(char *str, size_t str_size, const char *chrs,

			 u32 mask);

security/apparmor/include/policy.h

+12 −0
Original line number Diff line number Diff line
@@ -90,6 +90,18 @@ static inline void aa_destroy_policydb(struct aa_policydb *policy) 


}



static inline struct aa_perms *aa_lookup_perms(struct aa_policydb *policy,

					       unsigned int state)

{

	unsigned int index = ACCEPT_TABLE(policy->dfa)[state];



	if (!(policy->perms))

		return &default_perms;



	return &(policy->perms[index]);

}





/* struct aa_data - generic data structure

 * key: name for retrieving this data

 * size: size of data in bytes

security/apparmor/label.c

+3 −3
Original line number Diff line number Diff line
@@ -1328,7 +1328,7 @@ static int label_compound_match(struct aa_profile *profile, 
		if (!state)

			goto fail;

	}

	*perms = *aa_lookup_perms(profile->policy.perms, state);

	*perms = *aa_lookup_perms(&profile->policy, state);

	aa_apply_modes_to_perms(profile, perms);

	if ((perms->allow & request) != request)

		return -EACCES;
@@ -1379,7 +1379,7 @@ static int label_components_match(struct aa_profile *profile, 
	return 0;



next:

	tmp = *aa_lookup_perms(profile->policy.perms, state);

	tmp = *aa_lookup_perms(&profile->policy, state);

	aa_apply_modes_to_perms(profile, &tmp);

	aa_perms_accum(perms, &tmp);

	label_for_each_cont(i, label, tp) {
@@ -1388,7 +1388,7 @@ static int label_components_match(struct aa_profile *profile, 
		state = match_component(profile, tp, start);

		if (!state)

			goto fail;

		tmp = *aa_lookup_perms(profile->policy.perms, state);

		tmp = *aa_lookup_perms(&profile->policy, state);

		aa_apply_modes_to_perms(profile, &tmp);

		aa_perms_accum(perms, &tmp);

	}

security/apparmor/mount.c

+4 −4
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int do_match_mnt(struct aa_policydb *policy, unsigned int start, 
	state = match_mnt_flags(policy->dfa, state, flags);

	if (!state)

		return 4;

	*perms = *aa_lookup_perms(policy->perms, state);

	*perms = *aa_lookup_perms(policy, state);

	if (perms->allow & AA_MAY_MOUNT)

		return 0;
@@ -262,7 +262,7 @@ static int do_match_mnt(struct aa_policydb *policy, unsigned int start, 
		state = aa_dfa_match(policy->dfa, state, data);

		if (!state)

			return 5;

		*perms = *aa_lookup_perms(policy->perms, state);

		*perms = *aa_lookup_perms(policy, state);

		if (perms->allow & AA_MAY_MOUNT)

			return 0;

	}
@@ -584,7 +584,7 @@ static int profile_umount(struct aa_profile *profile, const struct path *path, 
	state = aa_dfa_match(profile->policy.dfa,

			     profile->policy.start[AA_CLASS_MOUNT],

			     name);

	perms = *aa_lookup_perms(profile->policy.perms, state);

	perms = *aa_lookup_perms(&profile->policy, state);

	if (AA_MAY_UMOUNT & ~perms.allow)

		error = -EACCES;
@@ -655,7 +655,7 @@ static struct aa_label *build_pivotroot(struct aa_profile *profile, 
			     new_name);

	state = aa_dfa_null_transition(profile->policy.dfa, state);

	state = aa_dfa_match(profile->policy.dfa, state, old_name);

	perms = *aa_lookup_perms(profile->policy.perms, state);

	perms = *aa_lookup_perms(&profile->policy, state);



	if (AA_MAY_PIVOTROOT & perms.allow)

		error = 0;