mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 00:14:44 +01:00
rule_ents from conditional block are dropped
In the following policy, "ptrace" would be dropped during merging: $FOO=true /bin/true { if $FOO { ptrace, } } Current behavior: ----- Debugging built structures ----- Name: /bin/true Local To: <NULL> Mode: With patch: ----- Debugging built structures ----- Name: /bin/true Local To: <NULL> Mode: ptrace,
This commit is contained in:
parent
8711c7754b
commit
dad66f663b
1 changed files with 2 additions and 0 deletions
|
@ -178,6 +178,8 @@ Profile *merge_policy(Profile *a, Profile *b)
|
|||
}
|
||||
}
|
||||
|
||||
a->rule_ents.splice(a->rule_ents.end(), b->rule_ents);
|
||||
|
||||
merge_hats(a, b->hat_table);
|
||||
delete b;
|
||||
out:
|
||||
|
|
Loading…
Add table
Reference in a new issue