mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 16:35:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

aa-genprof: don't crash if setting printk_ratelimit fails

Browse source 
When running aa-genprof in a lxd instance, printk_ratelimit is readonly
and writing to it fails. Instead of crashing with a backtrace, only
print a warning.

References: https://bugs.launchpad.net/apparmor/+bug/1785391
(cherry picked from commit 961e69afe5)
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Christian Boltz 2018-08-05 14:46:13 +02:00 • committed by John Johansen
parent 1aaffa6e1b
commit fccfaa6bfc
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
utils/aa-genprof
View file

@ -55,7 +55,11 @@ def last_audit_entry_time():
return logmark
def restore_ratelimit():
sysctl_write(ratelimit_sysctl, ratelimit_saved)
try:
sysctl_write(ratelimit_sysctl, ratelimit_saved)
except PermissionError:
if ratelimit_saved != sysctl_read(ratelimit_sysctl):
raise # happens only if a) running under lxd and b) something changed the ratelimit since starting aa-genprof
parser = argparse.ArgumentParser(description=_('Generate profile for the given program'))
parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
@ -120,7 +124,11 @@ if apparmor.helpers[program] == 'enforce':
# the printk ratelimit, and restore it on exit.
ratelimit_sysctl = '/proc/sys/kernel/printk_ratelimit'
ratelimit_saved = sysctl_read(ratelimit_sysctl)
sysctl_write(ratelimit_sysctl, 0)
try:
sysctl_write(ratelimit_sysctl, 0)
except PermissionError: # will fail in lxd
warn("Can't set printk_ratelimit, some events might be lost")
atexit.register(restore_ratelimit)