Skip directories and symlinks when mounting libraries #282
+49
−19
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
cdesiniotis
reviewed
Sep 11, 2024
elezar
force-pushed
the
skip-directories-and-symlinks
branch
from
db0263c
to
db63f0e
Compare
cdesiniotis
reviewed
Sep 16, 2024
|
LGTM besides the one nit. |
This ensures that only actual libraries from the compat folders are mounted into the container. Signed-off-by: Evan Lezar <[email protected]>
elezar
force-pushed
the
skip-directories-and-symlinks
branch
from
db63f0e
to
ad1f8c8
Compare
cdesiniotis
approved these changes
Sep 17, 2024
klueska
reviewed
Sep 18, 2024
| @@ -28,6 +28,7 @@ static char **mount_files(struct error *, const char *, const struct nvc_contain | |||
| static char **mount_driverstore_files(struct error *, const char *, const struct nvc_container *, const char *, const char *[], size_t); | |||
| static char *mount_directory(struct error *, const char *, const struct nvc_container *, const char *); | |||
| static char *mount_firmware(struct error *, const char *, const struct nvc_container *, const char *); | |||
| static char *mount_in_root(struct error *err, const char *src, const char *rootfs, const char *path, uid_t uid, uid_t gid, unsigned long mountflags); | |||
There was a problem hiding this comment.
For consistency, we shouldn't have the variable names here.
klueska
reviewed
Sep 18, 2024
| @@ -28,6 +28,7 @@ static char **mount_files(struct error *, const char *, const struct nvc_contain | |||
| static char **mount_driverstore_files(struct error *, const char *, const struct nvc_container *, const char *, const char *[], size_t); | |||
| static char *mount_directory(struct error *, const char *, const struct nvc_container *, const char *); | |||
| static char *mount_firmware(struct error *, const char *, const struct nvc_container *, const char *); | |||
| static char *mount_in_root(struct error *err, const char *src, const char *rootfs, const char *path, uid_t uid, uid_t gid, unsigned long mountflags); | |||
There was a problem hiding this comment.
Consider renaming to mount_at_with_flags()
klueska
reviewed
Sep 18, 2024
Comment on lines
53
to
54
| if (path_join(err, src, root, dir) < 0) | ||
| return (NULL); |
There was a problem hiding this comment.
Consider changing this to path_resolve_full() to be symmetrical with what we now do in mount_firmware().
klueska
reviewed
Sep 18, 2024
| return (NULL); | ||
| return mount_with_flags(err, src, dst, cnt->uid, cnt->gid, MS_RDONLY|MS_NODEV|MS_NOSUID); | ||
| return mount_with_flags(err, src, dst, uid, gid, mountflags); |
There was a problem hiding this comment.
If we can, let's just fold the logic for mount_with_flags() in here.
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 ensures that only actual libraries from the compat folders are mounted into the container.
If symlinks or directories are detected an error is raised.