-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[WIP] Make /proc/sys read-only with carve-outs for some sysctls #3518
Open
dgl
wants to merge
1
commit into
kubernetes-sigs:main
Choose a base branch
from
dgl:sysctl-readonly
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -172,13 +172,24 @@ fix_mount() { | |
sync | ||
fi | ||
|
||
# Mount sysfs and proc as read-write, on a known, but kind specific location. | ||
# This allows bind mounting, below and is also required to run some workloads | ||
# which need to mount proc and sysfs themselves (this avoids the proc and | ||
# sysfs mounts being "masked", as far as the kernel is concerned). | ||
# XXX, better ref for fs_fully_visible than kernel code? | ||
# https://github.com/torvalds/linux/commit/1b852bceb0d1 | ||
log_info 'mounting /kind/private filesystems' | ||
mount -t sysfs -o rw sysfs /kind/private/sys | ||
mount -t proc -o rw proc /kind/private/proc | ||
|
||
log_info 'remounting /sys read-only' | ||
# systemd-in-a-container should have read only /sys | ||
# https://systemd.io/CONTAINER_INTERFACE/ | ||
# however, we need other things from `docker run --privileged` ... | ||
# and this flag also happens to make /sys rw, amongst other things | ||
# | ||
# This step is ignored when running inside UserNS, because it fails with EACCES. | ||
# This step is ignored when running inside UserNS, because it can fail with | ||
# EACCES. | ||
if ! mount -o remount,ro /sys; then | ||
if [[ -n "$userns" ]]; then | ||
log_info 'UserNS: ignoring mount fail' | ||
|
@@ -187,6 +198,23 @@ fix_mount() { | |
fi | ||
fi | ||
|
||
log_info 'making /proc/sys read-only, with known sysctls read-write' | ||
mount --rbind -o ro /proc/sys /proc/sys | ||
# These are the sysctls known to be namespaced in the kernel, list taken from Kubernetes: | ||
# https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/component-helpers/node/util/sysctl/namespace.go | ||
# In addition the kubelet attempts to set some sysctl to particular settings, we allow those: | ||
# https://github.com/search?q=repo%3Akubernetes/kubernetes%20setupKernelTunables&type=code | ||
for mount_point in \ | ||
kernel/shmall kernel/shmmax kernel/shmmni kernel/shm_rmid_forced kernel/msgmax kernel/msgmnb kernel/msgmni \ | ||
fs/mqueue \ | ||
net \ | ||
vm/overcommit_memory vm/panic_on_oom kernel/panic kernel/panic_on_oops \ | ||
kernel/keys/root_maxkeys kernel/keys/root_maxbytes; do | ||
if [[ -f /kind/private/proc/sys/"${mount_point}" ]]; then | ||
mount --bind -o rw /kind/private/proc/sys/"${mount_point}" /proc/sys/"${mount_point}" | ||
fi | ||
done | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure about the robustness of this. |
||
|
||
log_info 'making mounts shared' | ||
# for mount propagation | ||
mount --make-rshared / | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unnecessary change