c/libsnap-confine-private, interfaces: account for reexec on arch #14682
+5
−67
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
zyga
approved these changes
Nov 1, 2024
andrewphelpsj
added
the
Needs security review
bboozzoo
approved these changes
Nov 1, 2024
| @@ -274,7 +274,7 @@ func SystemKeyMismatch(extraData SystemKeyExtraData) (bool, error) { | |||
| if mockedSystemKey == nil { | |||
| if exe, err := os.Readlink("/proc/self/exe"); err == nil { | |||
| // detect running local local builds | |||
There was a problem hiding this comment.
Suggested change
| // detect running local local builds | |
| // detect running local builds |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #14682 +/- ##
==========================================
+ Coverage 78.95% 78.97% +0.02%
==========================================
Files 1084 1085 +1
Lines 146638 147148 +510
==========================================
+ Hits 115773 116207 +434
- Misses 23667 23717 +50
- Partials 7198 7224 +26
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
…be prefixed with /var/lib/snapd This change accounts for that, allowing us to use SNAP_REEXEC on arch systems.
… system specific dirs.SnapMountDir This check was always failing on arch, since snaps are mounted under a different location.
Signed-off-by: Maciej Borzecki <[email protected]>
andrewphelpsj
force-pushed
the
fix-reexec-on-arch
branch
from
3ac0f5d
to
ba2dd67
Compare
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.
On arch, snap-confine's security tag will be prefixed with /var/lib/snapd. This change accounts for that, allowing us to use SNAP_REEXEC on arch systems.
Additionally, the fix in interfaces allows us to account for where snaps are installed on non-ubuntu systems.