mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-01 06:45:38 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cboltz-mergeprof-hasher-fun' into 'master'

Browse Source 
Fix aa-mergeprof crash caused by accidentially initialzed hat

See merge request apparmor/apparmor!234

Acked-by: John Johansen <john.johansen@canonical.com>

(cherry picked from commit 93445ca02d)

bc492533 Fix aa-mergeprof crash caused by accidentially initialzed hat
This commit is contained in:
Christian Boltz
2018-10-11 19:49:24 +00:00
parent 299953ab7b
commit 69d3d71cd9
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/apparmor/cleanprofile.py
View File

@@ -54,20 +54,24 @@ class CleanProf(object):
#If different files remove duplicate includes in the other profile #If different files remove duplicate includes in the other profile
if not self.same_file: if not self.same_file:
for inc in includes: if self.other.aa[program].get(hat): # carefully avoid to accidently initialize self.other.aa[program][hat]
if self.other.aa[program][hat]['include'].get(inc, False): for inc in includes:
self.other.aa[program][hat]['include'].pop(inc) if self.other.aa[program][hat]['include'].get(inc, False):
deleted += 1 self.other.aa[program][hat]['include'].pop(inc)
deleted += 1
#Clean up superfluous rules from includes in the other profile #Clean up superfluous rules from includes in the other profile
for inc in includes: for inc in includes:
if not self.profile.include.get(inc, {}).get(inc, False): if not self.profile.include.get(inc, {}).get(inc, False):
apparmor.load_include(inc) apparmor.load_include(inc)
deleted += apparmor.delete_duplicates(self.other.aa[program][hat], inc) if self.other.aa[program].get(hat): # carefully avoid to accidently initialize self.other.aa[program][hat]
deleted += apparmor.delete_duplicates(self.other.aa[program][hat], inc)
#Clean duplicate rules in other profile #Clean duplicate rules in other profile
for ruletype in apparmor.ruletypes: for ruletype in apparmor.ruletypes:
if not self.same_file: if not self.same_file:
deleted += self.other.aa[program][hat][ruletype].delete_duplicates(self.profile.aa[program][hat][ruletype]) if self.other.aa[program].get(hat): # carefully avoid to accidently initialize self.other.aa[program][hat]
deleted += self.other.aa[program][hat][ruletype].delete_duplicates(self.profile.aa[program][hat][ruletype])
else: else:
deleted += self.other.aa[program][hat][ruletype].delete_duplicates(None) deleted += self.other.aa[program][hat][ruletype].delete_duplicates(None)