Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

apparmor: verify permission table indexes

Browse Source 
While the dfa xindex's are verified, the indexes in the permission
table are not currently verified. Fix this.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2022-08-26 13:32:34 -07:00
parent fd1b2b95a2
commit 670f31774a
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
security/apparmor/policy_unpack.c
View File

@ -781,8 +781,9 @@ static int unpack_pdb(struct aa_ext *e, struct aa_policydb *policy,
*info = "failed to unpack profile transition table"; *info = "failed to unpack profile transition table";
goto fail; goto fail;
} }
/* TODO: move compat mapping here, requires dfa merging first */
/* TODO: move compat mapping here, requires dfa merging first */
/* TODO: move verify here, it has to be done after compat mappings */
out: out:
return 0; return 0;
@ -1149,6 +1150,22 @@ static bool verify_dfa_xindex(struct aa_dfa *dfa, int table_size)
return true; return true;
} }
static bool verify_perm_indexes(struct aa_policydb *pdb)
{
int i;
for (i = 0; i < pdb->size; i++) {
if (pdb->perms[i].xindex >= pdb->trans.size)
return false;
if (pdb->perms[i].tag >= pdb->trans.size)
return false;
if (pdb->perms[i].label >= pdb->trans.size)
return false;
}
return true;
}
/** /**
* verify_profile - Do post unpack analysis to verify profile consistency * verify_profile - Do post unpack analysis to verify profile consistency
* @profile: profile to verify (NOT NULL) * @profile: profile to verify (NOT NULL)
@ -1170,6 +1187,22 @@ static int verify_profile(struct aa_profile *profile)
return -EPROTO; return -EPROTO;
} }
if (!verify_perm_indexes(&profile->file)) {
audit_iface(profile, NULL, NULL,
"Unpack: Invalid perm index", NULL, -EPROTO);
return -EPROTO;
}
if (!verify_perm_indexes(&profile->policy)) {
audit_iface(profile, NULL, NULL,
"Unpack: Invalid perm index", NULL, -EPROTO);
return -EPROTO;
}
if (!verify_perm_indexes(&profile->xmatch)) {
audit_iface(profile, NULL, NULL,
"Unpack: Invalid perm index", NULL, -EPROTO);
return -EPROTO;
}
return 0; return 0;
} }