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

Fix logparser.py crash on change_hat events

Browse Source 
'change_hat' events have the target profile in 'name2', not in 'name'
(which is None and therefore causes a crash when checking if it contains
'//')

Also add the log event causing this crash to the libapparmor testsuite.

References: https://bugs.launchpad.net/apparmor/+bug/1523297


Acked-by: John Johansen <john.johansen@canonical.com> for trunk, 2.10 and 2.9.
This commit is contained in:
Christian Boltz 2015-12-12 13:05:14 +01:00
parent 6756a0771d
commit 451ab0d8f0
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
libraries/libapparmor/testsuite/test_multi/testcase_changehat_01.err Normal file
View File

1
libraries/libapparmor/testsuite/test_multi/testcase_changehat_01.in Normal file
View File

@ -0,0 +1 @@
type=AVC msg=audit(1449442292.901:961): apparmor="ALLOWED" operation="change_hat" profile="/usr/sbin/httpd{,2}-prefork" pid=8527 comm="httpd-prefork" target="/usr/sbin/httpd{,2}-prefork//HANDLING_UNTRUSTED_INPUT"

11
libraries/libapparmor/testsuite/test_multi/testcase_changehat_01.out Normal file
View File

@ -0,0 +1,11 @@
START
File: testcase_changehat_01.in
Event type: AA_RECORD_ALLOWED
Audit ID: 1449442292.901:961
Operation: change_hat
Profile: /usr/sbin/httpd{,2}-prefork
Command: httpd-prefork
Name2: /usr/sbin/httpd{,2}-prefork//HANDLING_UNTRUSTED_INPUT
PID: 8527
Epoch: 1449442292
Audit subid: 961

6
utils/apparmor/logparser.py
View File

@ -254,10 +254,10 @@ class ReadLog:
if e['operation'] == 'change_hat': if e['operation'] == 'change_hat':
if aamode != 'HINT' and aamode != 'PERMITTING': if aamode != 'HINT' and aamode != 'PERMITTING':
return None return None
profile = e['name'] profile = e['name2']
#hat = None #hat = None
if '//' in e['name']: if '//' in e['name2']:
profile, hat = e['name'].split('//')[:2] profile, hat = e['name2'].split('//')[:2]
if not hat: if not hat:
hat = profile hat = profile