mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 13:58:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cboltz-drop-safety-nets' into 'master'

Browse Source 
Drop some safety nets in aa.py

See merge request apparmor/apparmor!113
This commit is contained in:
John Johansen 2018-05-25 12:34:28 +00:00
commit 097ff0fa6b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/apparmor/aa.py
View File

@ -1749,7 +1749,7 @@ def match_includes(profile, rule_type, rule_obj):
newincludes = [] newincludes = []
for incname in include.keys(): for incname in include.keys():
# XXX type check should go away once we init all profiles correctly # XXX type check should go away once we init all profiles correctly
if valid_include(profile, incname) and include[incname][incname].get(rule_type, False) and include[incname][incname][rule_type].is_covered(rule_obj): if valid_include(profile, incname) and include[incname][incname][rule_type].is_covered(rule_obj):
newincludes.append(incname) newincludes.append(incname)
return newincludes return newincludes
@ -3395,7 +3395,6 @@ def is_known_rule(profile, rule_type, rule_obj):
if os.path.isdir(get_include_path(incname)): if os.path.isdir(get_include_path(incname)):
includelist += include_dir_filelist(profile_dir, incname) includelist += include_dir_filelist(profile_dir, incname)
else: else:
if include[incname][incname].get(rule_type, False):
if include[incname][incname][rule_type].is_covered(rule_obj, False): if include[incname][incname][rule_type].is_covered(rule_obj, False):
return True return True