sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

collector/dmesg: Query systcl kernel.dmesg_restrict

Browse Source 
Query systcl instead of checking CONFIG_SECURITY_DMESG_RESTRICT as that
option only provides a default value for the sysctl parameter.

Fixes https://github.com/ARM-software/devlib/issues/653
This commit is contained in:
Douglas Raillard 2023-10-18 18:37:50 +01:00 committed by Marc Bonnici
parent 18d2a343c7
commit d7d1deedda
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devlib/collector/dmesg.py
View File

@ -185,8 +185,13 @@ class DmesgCollector(CollectorBase):
self.basic_dmesg = '--force-prefix' not in \ self.basic_dmesg = '--force-prefix' not in \
self.target.execute('dmesg -h', check_exit_code=False) self.target.execute('dmesg -h', check_exit_code=False)
self.facility = facility self.facility = facility
self.needs_root = bool(target.config.typed_config.get( try:
'CONFIG_SECURITY_DMESG_RESTRICT', KernelConfigTristate.NO)) needs_root = target.read_sysctl('kernel.dmesg_restrict')
except ValueError:
needs_root = True
else:
needs_root = bool(int(needs_root))
self.needs_root = needs_root
self._begin_timestamp = None self._begin_timestamp = None
self.empty_buffer = empty_buffer self.empty_buffer = empty_buffer