niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

apparmor: make transition table unpack generic so it can be reused

Browse source 
Currently the transition table is tied to the file dfa. Make it so
we can unpack a transition table against any dfa.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2022-08-23 01:06:15 -07:00
parent 22fac8a051
commit a0792e2ced
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
security/apparmor/policy_unpack.c
View file

@ -466,13 +466,14 @@ static struct aa_dfa *unpack_dfa(struct aa_ext *e)
/** /**
* unpack_trans_table - unpack a profile transition table * unpack_trans_table - unpack a profile transition table
* @e: serialized data extent information (NOT NULL) * @e: serialized data extent information (NOT NULL)
* @profile: profile to add the accept table to (NOT NULL) * @table: str table to unpack to (NOT NULL)
* *
* Returns: true if table successfully unpacked * Returns: true if table successfully unpacked or not present
*/ */
static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile) static bool unpack_trans_table(struct aa_ext *e, struct aa_str_table *strs)
{ {
void *saved_pos = e->pos; void *saved_pos = e->pos;
char **table;
/* exec table is optional */ /* exec table is optional */
if (unpack_nameX(e, AA_STRUCT, "xtable")) { if (unpack_nameX(e, AA_STRUCT, "xtable")) {
@ -482,12 +483,10 @@ static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile)
/* currently 2^24 bits entries 0-3 */ /* currently 2^24 bits entries 0-3 */
if (size > (1 << 24)) if (size > (1 << 24))
goto fail; goto fail;
profile->file.trans.table = kcalloc(size, sizeof(char *), table = kcalloc(size, sizeof(char *), GFP_KERNEL);
GFP_KERNEL); if (!table)
if (!profile->file.trans.table)
goto fail; goto fail;
profile->file.trans.size = size;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
char *str; char *str;
int c, j, pos, size2 = unpack_strdup(e, &str, NULL); int c, j, pos, size2 = unpack_strdup(e, &str, NULL);
@ -496,7 +495,7 @@ static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile)
*/ */
if (!size2) if (!size2)
goto fail; goto fail;
profile->file.trans.table[i] = str; table[i] = str;
/* verify that name doesn't start with space */ /* verify that name doesn't start with space */
if (isspace(*str)) if (isspace(*str))
goto fail; goto fail;
@ -530,11 +529,14 @@ static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile)
goto fail; goto fail;
if (!unpack_nameX(e, AA_STRUCTEND, NULL)) if (!unpack_nameX(e, AA_STRUCTEND, NULL))
goto fail; goto fail;
strs->table = table;
strs->size = size;
} }
return true; return true;
fail: fail:
aa_free_str_table(&profile->file.trans); kfree_sensitive(table);
e->pos = saved_pos; e->pos = saved_pos;
return false; return false;
} }
@ -880,7 +882,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
info = "failed to remap file permission table"; info = "failed to remap file permission table";
goto fail; goto fail;
} }
if (!unpack_trans_table(e, profile)) { if (!unpack_trans_table(e, &profile->file.trans)) {
info = "failed to unpack profile transition table"; info = "failed to unpack profile transition table";
goto fail; goto fail;
} }