mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update of unattached profile to require profile keyword

Browse source
This commit is contained in:
John Johansen 2008-04-06 18:54:52 +00:00
parent d4c9f0ad0c
commit 13e04a9f02
3 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
parser/immunix.h
View file

@ -81,6 +81,7 @@
#define AA_EXEC_INHERIT (AA_EXEC_MOD_1)
#define AA_EXEC_PROFILE (AA_EXEC_MOD_0 | AA_EXEC_MOD_1)
#define AA_EXEC_PROFILE_OR_INHERIT (AA_EXEC_MOD_2)
#define AA_EXEC_LOCAL (AA_EXEC_MOD_2 | AA_EXEC_MOD_0)
#define AA_VALID_PERMS (AA_FILE_PERMS | AA_CHANGE_PROFILE)

1
parser/parser_misc.c
View file

@ -67,6 +67,7 @@ static struct keyword_table keyword_table[] = {
{"subset", TOK_SUBSET},
{"audit", TOK_AUDIT},
{"deny", TOK_DENY},
{"profile", TOK_PROFILE},
/* terminate */
{NULL, 0}
};

35
parser/parser_yacc.y
View file

@ -99,6 +99,7 @@ struct cod_entry *do_file_rule(char *namespace, char *id, int mode,
%token TOK_SUBSET
%token TOK_AUDIT
%token TOK_DENY
%token TOK_PROFILE
/* capabilities */
%token TOK_CAPABILITY
@ -156,6 +157,7 @@ struct cod_entry *do_file_rule(char *namespace, char *id, int mode,
%type <boolean> opt_subset_flag
%type <boolean> opt_audit_flag
%type <boolean> opt_owner_flag
%type <boolean> opt_profile_flag
%%
@ -170,46 +172,49 @@ profilelist: profilelist profile
add_to_list($2);
};
profile: TOK_ID flags TOK_OPEN rules TOK_CLOSE
opt_profile_flag: { /* nothing */ $$ = 0; }
| TOK_PROFILE { $$ = 1; }
profile: opt_profile_flag TOK_ID flags TOK_OPEN rules TOK_CLOSE
{
struct codomain *cod = $4;
PDEBUG("Matched: id (%s) open rules close\n", $1);
struct codomain *cod = $5;
PDEBUG("Matched: id (%s) open rules close\n", $2);
if (!cod) {
yyerror(_("Memory allocation error."));
}
if ($1[0] != '/')
yyerror(_("Profile names must begin with a '/'."));
if (!$1 && $2[0] != '/')
yyerror(_("Profile names must begin with a '/', or keyword 'profile'."));
cod->name = $1;
cod->flags = $2;
cod->name = $2;
cod->flags = $3;
if (force_complain)
cod->flags = force_complain_flags;
PDEBUG("%s: flags='%s%s'\n",
$1,
$2,
cod->flags.complain ? "complain, " : "",
cod->flags.audit ? "audit" : "");
$$ = cod;
};
profile: TOK_COLON TOK_ID TOK_COLON TOK_ID flags TOK_OPEN rules TOK_CLOSE
profile: opt_profile_flag TOK_COLON TOK_ID TOK_COLON TOK_ID flags TOK_OPEN rules TOK_CLOSE
{
struct codomain *cod = $7;
PDEBUG("Matched: id (%s:%s) open rules close\n", $2, $4);
struct codomain *cod = $8;
PDEBUG("Matched: id (%s:%s) open rules close\n", $3, $5);
if (!cod) {
yyerror(_("Memory allocation error."));
}
cod->namespace = $2;
cod->name = $4;
cod->flags = $5;
cod->namespace = $3;
cod->name = $5;
cod->flags = $6;
if (force_complain)
cod->flags = force_complain_flags;
PDEBUG("%s: flags='%s%s'\n",
$2,
$3,
cod->flags.complain ? "complain, " : "",
cod->flags.audit ? "audit" : "");