fix: make etc binds read-only #10155
Merged
+38
−15
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
|
Before: ❯ talosctl -n 10.5.0.3 read /proc/mounts | grep "/etc"
tmpfs /etc/cri/conf.d/hosts tmpfs rw,seclabel,relatime,mode=755 0 0
tmpfs /etc/cri/conf.d/01-registries.part tmpfs rw,seclabel,relatime,mode=755 0 0
tmpfs /etc/ssl/certs/ca-certificates tmpfs rw,seclabel,relatime,mode=755 0 0
tmpfs /etc/cri/conf.d/cri.toml tmpfs rw,seclabel,relatime,mode=755 0 0
tmpfs /etc/resolv.conf tmpfs rw,seclabel,relatime,mode=755 0 0
tmpfs /etc/hosts tmpfs rw,seclabel,relatime,mode=755 0 0
tmpfs /etc/cri/conf.d/base-spec.json tmpfs rw,seclabel,relatime,mode=755 0 0
tmpfs /etc/machine-id tmpfs rw,seclabel,relatime,mode=755 0 0
overlay /etc/cni overlay rw,seclabel,relatime,lowerdir=/etc/cni,upperdir=/var/system/overlays/etc-cni-diff,workdir=/var/system/overlays/etc-cni-workdir 0 0
overlay /etc/kubernetes overlay rw,seclabel,relatime,lowerdir=/etc/kubernetes,upperdir=/var/system/overlays/etc-kubernetes-diff,workdir=/var/system/overlays/etc-kubernetes-workdir 0 0After: ❯ talosctl -n 10.5.0.3 read /proc/mounts | grep "/etc"
tmpfs /etc/cri/conf.d/hosts tmpfs ro,seclabel,relatime,mode=755 0 0
tmpfs /etc/cri/conf.d/01-registries.part tmpfs ro,seclabel,relatime,mode=755 0 0
tmpfs /etc/ssl/certs/ca-certificates tmpfs ro,seclabel,relatime,mode=755 0 0
tmpfs /etc/cri/conf.d/cri.toml tmpfs ro,seclabel,relatime,mode=755 0 0
tmpfs /etc/resolv.conf tmpfs ro,seclabel,relatime,mode=755 0 0
tmpfs /etc/hosts tmpfs ro,seclabel,relatime,mode=755 0 0
tmpfs /etc/cri/conf.d/base-spec.json tmpfs ro,seclabel,relatime,mode=755 0 0
tmpfs /etc/machine-id tmpfs ro,seclabel,relatime,mode=755 0 0
overlay /etc/cni overlay rw,seclabel,relatime,lowerdir=/etc/cni,upperdir=/var/system/overlays/etc-cni-diff,workdir=/var/system/overlays/etc-cni-workdir 0 0
overlay /etc/kubernetes overlay rw,seclabel,relatime,lowerdir=/etc/kubernetes,upperdir=/var/system/overlays/etc-kubernetes-diff,workdir=/var/system/overlays/etc-kubernetes-workdir 0 0 |
frezbo
commented
Jan 16, 2025
| @@ -134,8 +134,8 @@ func (ctrl *EtcFileController) Run(ctx context.Context, r controller.Runtime, lo | |||
|
|
|||
| logger.Debug("writing file contents", zap.String("dst", dst), zap.Stringer("version", spec.Metadata().Version())) | |||
|
|
|||
| if err = UpdateFile(dst, spec.TypedSpec().Contents, spec.TypedSpec().Mode, spec.TypedSpec().SelinuxLabel); err != nil { | |||
| return fmt.Errorf("error updating %q: %w", dst, err) | |||
| if err = UpdateFile(src, spec.TypedSpec().Contents, spec.TypedSpec().Mode, spec.TypedSpec().SelinuxLabel); err != nil { | |||
There was a problem hiding this comment.
we were writing to /etc 💩
smira
approved these changes
Jan 16, 2025
DmitriyMV
approved these changes
Jan 16, 2025
frezbo
force-pushed
the
fix/bind-mount-ro
branch
3 times, most recently
from
9c4995c to
0918906
Compare
Fix the `/etc` bind mounts read-only by calling a remount as `ro`. The proper fix is to use new `fsopen` and `fsmount` API's. Signed-off-by: Noel Georgi <[email protected]>
frezbo
force-pushed
the
fix/bind-mount-ro
branch
from
0918906 to
8dea57a
Compare
|
/m |
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.
Fix the
/etcbind mounts read-only by calling a remount asro.The proper fix is to use new
fsopenandfsmountAPI's.