iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apparmor: convert xmatch lookup to use accept as an index

Browse Source 
Remap xmatch dfa accept table from embedded perms to an index and then
move xmatch lookup to use accept entry to index into the xmatch table.

This is step towards unifying permission lookup and reducing the
size of permissions tables.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2020-11-13 23:36:09 -08:00
parent 7572fea31e
commit 2d63dd43ae
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
security/apparmor/domain.c
View File

@ -328,7 +328,7 @@ static int aa_xattrs_match(const struct linux_binprm *bprm,
size = vfs_getxattr_alloc(&init_user_ns, d, profile->xattrs[i],
&value, value_size, GFP_KERNEL);
if (size >= 0) {
u32 perm;
u32 index, perm;
/*
* Check the xattr presence before value. This ensure
@ -340,7 +340,8 @@ static int aa_xattrs_match(const struct linux_binprm *bprm,
/* Check xattr value */
state = aa_dfa_match_len(profile->xmatch.dfa, state,
value, size);
perm = profile->xmatch.perms[state].allow;
index = ACCEPT_TABLE(profile->xmatch.dfa)[state];
perm = profile->xmatch.perms[index].allow;
if (!(perm & MAY_EXEC)) {
ret = -EINVAL;
goto out;
@ -416,12 +417,13 @@ restart:
*/
if (profile->xmatch.dfa) {
unsigned int state, count;
u32 perm;
u32 index, perm;
state = aa_dfa_leftmatch(profile->xmatch.dfa,
profile->xmatch.start[AA_CLASS_XMATCH],
name, &count);
perm = profile->xmatch.perms[state].allow;
index = ACCEPT_TABLE(profile->xmatch.dfa)[state];
perm = profile->xmatch.perms[index].allow;
/* any accepting state means a valid match. */
if (perm & MAY_EXEC) {
int ret = 0;

1
security/apparmor/policy_unpack.c
View File

@ -930,6 +930,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
info = "failed to convert xmatch permission table";
goto fail;
}
remap_dfa_accept(profile->xmatch.dfa, 1);
}
/* disconnected attachment string is optional */