Fix apparmor version checks #20305
Merged
Fix apparmor version checks #20305
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cyphar
force-pushed
the
fix-apparmor-version-checks
branch
from
8a929aa to
43047da
Compare
Contributor
Author
|
/cc @jfrazelle |
Using {{if major}}{{if minor}} doesn't work as expected when the major
version changes. In addition, this didn't support patch levels (which is
necessary in some cases when distributions ship apparmor weirdly).
Signed-off-by: Aleksa Sarai <[email protected]>
cyphar
force-pushed
the
fix-apparmor-version-checks
branch
from
43047da to
284d9d4
Compare
Ubuntu ships apparmor_parser 2.9 erroniously as "2.8.95". Fix the incorrect version check for >=2.8, when in fact 2.8 deosn't support the required feature. Signed-off-by: Aleksa Sarai <[email protected]>
Contributor
|
LGTM |
1 similar comment
Contributor
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The method used for checking the version of apparmor_parser
isn't actually correct (a version of 3.0 would cause the checks for
>2.9to break). In addition, one of the version checks (for suppressingptrace denials) was not correct due to the Ubuntu package having
a misleading version number (2.8.95 which is actually 2.9).
This includes a carry of #20270, as well as fixing how versions are checked.
Signed-off-by: Aleksa Sarai [email protected]