mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-05 00:35:13 +00:00
Code Issues Releases Wiki Activity

Convert codomain to a class

Browse Source 
Convert the codomain to a class, and the policy lists that store
codomains to stl containers instead of glibc twalk.

Signed-off-by: John Johansen <john.johansen@canonical.com>
[tyhicks: Merge with dbus changes and process_file_entries() cleanup]
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
John Johansen
2013-09-27 16:16:37 -07:00
committed by Tyler Hicks
parent dc76404590
commit a28e66c5fe
16 changed files with 883 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
parser/parser_merge.c
View File

@@ -25,7 +25,7 @@
#define _(s) gettext(s)
#include "parser.h"
#include "profile.h"
static int file_comp(const void *c1, const void *c2)
{
@@ -74,35 +74,35 @@ static int file_comp(const void *c1, const void *c2)
return strcmp((*e1)->name, (*e2)->name);
}
static int process_file_entries(struct codomain *cod)
static int process_file_entries(Profile *prof)
{
struct cod_entry *cur, *next;
struct cod_entry **table;
int n, count = 0;
for (cur = cod->entries; cur; cur = cur->next)
for (cur = prof->entries; cur; cur = cur->next)
count++;
if (count < 2)
return 1;
return 0;
table = (struct cod_entry **) malloc(sizeof(struct cod_entry *) * (count + 1));
if (!table) {
PERROR(_("Couldn't merge entries. Out of Memory\n"));
return 0;
return ENOMEM;
}
for (cur = cod->entries, n = 0; cur; cur = cur->next, n++)
for (cur = prof->entries, n = 0; cur; cur = cur->next, n++)
table[n] = cur;
qsort(table, count, sizeof(struct cod_entry *), file_comp);
table[count] = NULL;
for (n = 0; n < count; n++)
table[n]->next = table[n + 1];
cod->entries = table[0];
prof->entries = table[0];
free(table);
/* walk the sorted table merging similar entries */
for (cur = cod->entries, next = cur->next; next; next = cur->next) {
for (cur = prof->entries, next = cur->next; next; next = cur->next) {
if (file_comp(&cur, &next) != 0) {
cur = next;
continue;
@@ -111,8 +111,8 @@ static int process_file_entries(struct codomain *cod)
/* check for merged x consistency */
if (!is_merged_x_consistent(cur->mode, next->mode)) {
PERROR(_("profile %s: has merged rule %s with conflicting x modifiers\n"),
cod->name, cur->name);
return 0;
prof->name, cur->name);
return -1;
}
cur->mode |= next->mode;
cur->audit |= next->audit;
@@ -122,18 +122,10 @@ static int process_file_entries(struct codomain *cod)
free_cod_entries(next);
}
return 1;
}
int codomain_merge_rules(struct codomain *cod)
{
if (!process_file_entries(cod))
goto fail;
/* XXX return error from this */
merge_hat_rules(cod);
return 1;
fail:
return 0;
}
int profile_merge_rules(Profile *prof)
{
return process_file_entries(prof);
}