Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Mask Linux thermal interrupt info in /proc and /sys. #131018

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Mask Linux thermal interrupt info in /proc and /sys. #131018

wants to merge 1 commit into from

Conversation

saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented Mar 24, 2025 •
edited
Loading

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

On Linux, mask "/proc/interrupts" and "/sys/devices/system/cpu/cpu/thermal_throttle" inside containers by default. Privileged containers or containers started with --security-opt="systempaths=unconfined" are not affected.

Mitigates potential Thermal Side-Channel Vulnerability Exploit (https://github.com/moby/moby/security/advisories/GHSA-6fw5-f8r9-fgfm).

Also: improve integration test TestCreateWithCustomMaskedPaths() to ensure default masked paths don't apply to privileged containers.

Which issue(s) this PR fixes:

Refers to moby/moby#49560, cri-o/cri-o#9069

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

Masked off access to Linux thermal interrupt info in `/proc` and `/sys`.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

None

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 24, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: saschagrunert
Once this PR has been reviewed and has the lgtm label, please assign liggitt for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@saschagrunert saschagrunert mentioned this pull request Mar 24, 2025
Merged
@saschagrunert saschagrunert added the sig/node Categorizes an issue or PR as relevant to SIG Node. label Mar 24, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. label Mar 24, 2025
@dims
Copy link
Member

dims commented Mar 24, 2025

looks like we need darwin support too! (typecheck fail)

@saschagrunert
Mask Linux thermal interrupt info in /proc and /sys.
65b8fba 
On Linux, mask "/proc/interrupts" and "/sys/devices/system/cpu/cpu<x>/thermal_throttle"
inside containers by default. Privileged containers or containers started
with --security-opt="systempaths=unconfined" are not affected.

Mitigates potential Thermal Side-Channel Vulnerability Exploit
(https://github.com/moby/moby/security/advisories/GHSA-6fw5-f8r9-fgfm).

Also: improve integration test TestCreateWithCustomMaskedPaths() to ensure
default masked paths don't apply to privileged containers.

Refers to moby/moby#49560

Signed-off-by: Sascha Grunert <[email protected]>
@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/test pull-kubernetes-e2e-capz-windows-master

@saschagrunert
Copy link
Member Author

/retest

1 similar comment
@saschagrunert
Copy link
Member Author

/retest

@k8s-ci-robot
Copy link
Contributor

@saschagrunert: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-e2e-capz-windows-master 65b8fba link false /test pull-kubernetes-e2e-capz-windows-master

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@saschagrunert
Copy link
Member Author

pull-kubernetes-e2e-capz-windows-master is mostly red over all PR's 🤔
/skip

@sftim
Copy link
Contributor

sftim commented Mar 25, 2025

Changelog suggestion

-Mask Linux thermal interrupt info in `/proc` and `/sys`.
+Masked off access to Linux thermal interrupt info in `/proc` and `/sys`.

@saschagrunert
Copy link
Member Author

Changelog suggestion

Thanks, applied as suggested.

@bart0sh
Copy link
Contributor

bart0sh commented Mar 26, 2025

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Mar 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node: code and documentation PRs
Status: Needs Reviewer
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@saschagrunert @k8s-ci-robot @dims @sftim @bart0sh