mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

Fix "Invalid mode found: /usr/lib64/firefox/firefox.sh"

Browse Source 
After several hours of debugging on IRC and flooding paste.opensuse.org ;-)
I finally found the reason - reading(!) from log_dict with a wrong 
key caused the creation of that strange mode in log_dict.keys().

While finding that bug was very hard, the fix is easy - just replace 
"profile" with "aamode". (That probably makes one char per hour of 
debugging...)

To improve that ratio, also add a warning to common.py so that this 
interesting[tm] behaviour of hasher() is at least documented.


Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
Christian Boltz
2014-10-14 12:54:39 +02:00
parent 7e84f4efe9
commit d11055aa0c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/apparmor/aa.py
View File

@@ -1938,7 +1938,7 @@ def ask_the_questions():
# #
for family in sorted(log_dict[aamode][profile][hat]['netdomain'].keys()): for family in sorted(log_dict[aamode][profile][hat]['netdomain'].keys()):
# severity handling for net toggles goes here # severity handling for net toggles goes here
for sock_type in sorted(log_dict[profile][profile][hat]['netdomain'][family].keys()): for sock_type in sorted(log_dict[aamode][profile][hat]['netdomain'][family].keys()):
if profile_known_network(aa[profile][hat], family, sock_type): if profile_known_network(aa[profile][hat], family, sock_type):
continue continue
default_option = 1 default_option = 1

2
utils/apparmor/common.py
View File

@@ -200,6 +200,8 @@ def readkey():
def hasher(): def hasher():
'''A neat alternative to perl's hash reference''' '''A neat alternative to perl's hash reference'''
# Creates a dictionary for any depth and returns empty dictionary otherwise # Creates a dictionary for any depth and returns empty dictionary otherwise
# WARNING: when reading non-existing sub-dicts, empty dicts will be added.
# This might cause strange effects when using .keys()
return collections.defaultdict(hasher) return collections.defaultdict(hasher)
def convert_regexp(regexp): def convert_regexp(regexp):