Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
kernel-hardening-checker
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fact-depend
kernel-hardening-checker
Commits
e1dba290
Commit
e1dba290
authored
Jul 12, 2023
by
Alexander Popov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Precise the regular expressions in detect_arch() and detect_kernel_version()
And fix the wording in the error message by the way.
parent
320ab961
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
__init__.py
kconfig_hardened_check/__init__.py
+3
-3
No files found.
kconfig_hardened_check/__init__.py
View file @
e1dba290
...
@@ -31,7 +31,7 @@ def _open(file: str, *args, **kwargs):
...
@@ -31,7 +31,7 @@ def _open(file: str, *args, **kwargs):
def
detect_arch
(
fname
,
archs
):
def
detect_arch
(
fname
,
archs
):
with
_open
(
fname
,
'rt'
,
encoding
=
'utf-8'
)
as
f
:
with
_open
(
fname
,
'rt'
,
encoding
=
'utf-8'
)
as
f
:
arch_pattern
=
re
.
compile
(
"CONFIG_[a-zA-Z0-9_]
*=y
"
)
arch_pattern
=
re
.
compile
(
"CONFIG_[a-zA-Z0-9_]
+=y$
"
)
arch
=
None
arch
=
None
for
line
in
f
.
readlines
():
for
line
in
f
.
readlines
():
if
arch_pattern
.
match
(
line
):
if
arch_pattern
.
match
(
line
):
...
@@ -40,7 +40,7 @@ def detect_arch(fname, archs):
...
@@ -40,7 +40,7 @@ def detect_arch(fname, archs):
if
arch
is
None
:
if
arch
is
None
:
arch
=
option
arch
=
option
else
:
else
:
return
None
,
'
more than one supported microarchitecture is detected
'
return
None
,
'
detected more than one microarchitecture
'
if
arch
is
None
:
if
arch
is
None
:
return
None
,
'failed to detect microarchitecture'
return
None
,
'failed to detect microarchitecture'
return
arch
,
'OK'
return
arch
,
'OK'
...
@@ -48,7 +48,7 @@ def detect_arch(fname, archs):
...
@@ -48,7 +48,7 @@ def detect_arch(fname, archs):
def
detect_kernel_version
(
fname
):
def
detect_kernel_version
(
fname
):
with
_open
(
fname
,
'rt'
,
encoding
=
'utf-8'
)
as
f
:
with
_open
(
fname
,
'rt'
,
encoding
=
'utf-8'
)
as
f
:
ver_pattern
=
re
.
compile
(
"# Linux/.
* Kernel Configuration
"
)
ver_pattern
=
re
.
compile
(
"# Linux/.
+ Kernel Configuration$
"
)
for
line
in
f
.
readlines
():
for
line
in
f
.
readlines
():
if
ver_pattern
.
match
(
line
):
if
ver_pattern
.
match
(
line
):
line
=
line
.
strip
()
line
=
line
.
strip
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment