← Back to branch summary

~ubuntu-branches/ubuntu/precise/apparmor/precise-security

« back to all changes in this revision

Viewing changes to parser/parser_yacc.y

  • Committer: Package Import Robot
  • Author(s): Steve Beattie, Jamie Strandboge, Serge Hallyn, Steve Beattie
  • Date: 2012-04-12 06:17:42 UTC
  • Revision ID: package-import@ubuntu.com-20120412061742-9v75hjko2mjtbewv
Tags: 2.7.102-0ubuntu3
https://launchpad.net/bugs/974089
https://launchpad.net/bugs/978297
https://launchpad.net/bugs/963756
https://launchpad.net/bugs/959560
https://launchpad.net/bugs/872446
https://launchpad.net/bugs/978584
https://launchpad.net/bugs/800826
https://launchpad.net/bugs/979095
https://launchpad.net/bugs/963756
https://launchpad.net/bugs/978038
https://launchpad.net/bugs/968956
https://launchpad.net/bugs/979135
[ Jamie Strandboge ]
* debian/patches/0007-ubuntu-manpage-updates.patch: update apparmor(5)
  to describe Ubuntu's two-stage policy load and how to add utilize it
  when developing policy (LP: #974089)

[ Serge Hallyn ]
* debian/apparmor.init: do nothing in a container.  This can be
  removed once stacked profiles are supported and used by lxc.
  (LP: #978297)

[ Steve Beattie ]
* debian/patches/0008-apparmor-lp963756.patch: Fix permission mapping
  for change_profile onexec (LP: #963756)
* debian/patches/0009-apparmor-lp959560-part1.patch,
  debian/patches/0010-apparmor-lp959560-part2.patch: Update the parser
  to support the 'in' keyword for value lists, and make mount
  operations aware of 'in' keyword so they can affect the flags build
  list (LP: #959560)
* debian/patches/0011-apparmor-lp872446.patch: fix logprof missing
  exec events in complain mode (LP: #872446)
* debian/patches/0012-apparmor-lp978584.patch: allow inet6 access in
  dovecot imap-login profile (LP: #978584)
* debian/patches/0013-apparmor-lp800826.patch: fix libapparmor
  log parsing library from dropping apparmor network events that
  contain ip addresses or ports in them (LP: #800826)
* debian/patches/0014-apparmor-lp979095.patch: document new mount rule
  syntax and usage in apparmor.d(5) manpage (LP: #979095)
* debian/patches/0015-apparmor-lp963756.patch: Fix change_onexec
  for profiles without attachment specification (LP: #963756,
  LP: #978038)
* debian/patches/0016-apparmor-lp968956.patch: Fix protocol error when
  loading policy to kernels without compat patches (LP: #968956)
* debian/patches/0017-apparmor-lp979135.patch: Fix change_profile to
  grant access to /proc/attr api (LP: #979135)

Show diffs side-by-side

added added

removed removed

Lines of Context:
parser/parser_yacc.y
121
121
%token TOK_REMOUNT
122
122
%token TOK_UMOUNT
123
123
%token TOK_PIVOTROOT
 
124
%token TOK_IN
124
125
 
125
126
 /* rlimits */
126
127
%token TOK_RLIMIT
256
257
                if (force_complain)
257
258
                        cod->flags.complain = 1;
258
259
 
259
 
                post_process_nt_entries(cod);
 
260
                post_process_file_entries(cod);
260
261
                post_process_mnt_entries(cod);
261
262
                PDEBUG("%s: flags='%s%s'\n",
262
263
                       $2,
1068
1069
                struct value_list *value = new_value_list($3);
1069
1070
                if (!value)
1070
1071
                        yyerror(_("Memory allocation error."));
1071
 
                ent = new_cond_entry($1, value);
 
1072
                ent = new_cond_entry($1, 1, value);
1072
1073
                if (!ent) {
1073
1074
                        free_value_list(value);
1074
1075
                        yyerror(_("Memory allocation error."));
1078
1079
 
1079
1080
cond: TOK_CONDID TOK_EQUALS TOK_OPENPAREN valuelist TOK_CLOSEPAREN
1080
1081
        {
1081
 
                struct cond_entry *ent = new_cond_entry($1, $4);
 
1082
                struct cond_entry *ent = new_cond_entry($1, 1, $4);
 
1083
 
 
1084
                if (!ent)
 
1085
                        yyerror(_("Memory allocation error."));
 
1086
                $$ = ent;
 
1087
        }
 
1088
 
 
1089
 
 
1090
cond: TOK_CONDID TOK_IN TOK_OPENPAREN valuelist TOK_CLOSEPAREN
 
1091
        {
 
1092
                struct cond_entry *ent = new_cond_entry($1, 0, $4);
1082
1093
 
1083
1094
                if (!ent)
1084
1095
                        yyerror(_("Memory allocation error."));