apparmor: fix incorrect usage of sizeof on char ptr #2235
Merged
Conversation
This file contains 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
Merged
In criu/apparmor.c: write_aa_policy(), the arg path is passed as a char pointer. The original code used sizeof(path) to get the size of it, which is incorrect as it always return the size of the char pointer (typically 8 or 4), not the actual capacity of the char array. Given that this function is only invoked with path declared as `char path[PATH_MAX]`, replacing sizeof(path) with PATH_MAX should correctly represent the maximum size of it. Fixes: 8723e3f ("check: add a feature test for apparmor_stacking") Signed-off-by: Haorong Lu <[email protected]>
ancientmodern
force-pushed
the
apparmor-sizeof
branch
from
c876b45
to
1c7af5e
Compare
rst0git
approved these changes
Aug 2, 2023
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## criu-dev #2235 +/- ##
============================================
+ Coverage 70.38% 70.65% +0.26%
============================================
Files 134 133 -1
Lines 34044 33321 -723
============================================
- Hits 23963 23544 -419
+ Misses 10081 9777 -304
☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This makes the apparmor replace file path on riscv64 (#2234) zdtm/static/apparmor_stacking appear as
/sys/kernel/security/apparmor/policy/namespaces/criu_stacking_test/.replac, where the final e is missing and leads to an error onopen(). Although heresizeof(path) - offset - my_offsetshould be automatically converted to a quite large unsigned int, and the return value is still 9. Maybe it's due to different glibc implementation? 🤔As paths are always declared as
char path[PATH_MAX]when calling this function, I think it's okay to directly usePATH_MAXrather than introducing a new argument like size?