mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-29 21:38:15 +00:00
Code Issues Releases Wiki Activity

Merge ask_exec: Stop checking for CMD_nx (named exec)

Browse Source 
... because it gets translated to CMD_px or CMD_cx earlier in the
function.

Also add a safety check for unknown answers.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1072
Approved-by: John Johansen <john@jjmx.net>
Merged-by: John Johansen <john@jjmx.net>
This commit is contained in:
John Johansen 2023-07-19 21:17:35 +00:00
commit 17a521ff50
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/apparmor/aa.py
View File

@ -1031,7 +1031,7 @@ def ask_exec(hashlog):
if target_profile and hashlog[aamode].get(target_profile): if target_profile and hashlog[aamode].get(target_profile):
hashlog[aamode][target_profile]['final_name'] = profile hashlog[aamode][target_profile]['final_name'] = profile
elif re.search('^CMD_(px|nx|pix|nix)', ans): elif ans.startswith('CMD_px') or ans.startswith('CMD_pix'):
if to_name: if to_name:
exec_target = to_name exec_target = to_name
@ -1087,6 +1087,8 @@ def ask_exec(hashlog):
elif ans.startswith('CMD_ux'): elif ans.startswith('CMD_ux'):
continue continue
else:
raise AppArmorBug('Unhandled ans %s, please open a bugreport!' % ans)
def order_globs(globs, original_path): def order_globs(globs, original_path):
"""Returns the globs in sorted order, more specific behind""" """Returns the globs in sorted order, more specific behind"""