Skip to content

[release-1.27] OCPBUGS-33810: server: use SecureJoin when setting container /etc directory #8234

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
Merged
merged 3 commits into from
May 31, 2024
Merged

[release-1.27] OCPBUGS-33810: server: use SecureJoin when setting container /etc directory #8234

merged 3 commits into from
May 31, 2024

Conversation

@kwilczynski
Copy link
Contributor

@kwilczynski kwilczynski commented May 31, 2024

This is a manual cherry-pick of #8225

/assign haircommander
/assign kwilczynski

Fix CVE-2024-5154 where a malicious container image could make a symlink of `/proc/mounts` on the host, out of the container's rootfs

Krzysztof Wilczyński and others added 3 commits May 31, 2024 20:11
@kwilczynski kwilczynski requested a review from mrunalp as a code owner May 31, 2024 11:13
@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels May 31, 2024
@openshift-ci openshift-ci bot requested review from QiWang19 and wgahnagl May 31, 2024 11:13
@kwilczynski kwilczynski changed the title server: use SecureJoin when setting container /etc directory [release-1.27] server: use SecureJoin when setting container /etc directory May 31, 2024
@kwilczynski
Copy link
Contributor Author

kwilczynski commented May 31, 2024

/approve

@kwilczynski
Copy link
Contributor Author

kwilczynski commented May 31, 2024

/hold

For the following to be merged first:

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 31, 2024
@kwilczynski kwilczynski mentioned this pull request May 31, 2024
Merged
@kwilczynski kwilczynski changed the title [release-1.27] server: use SecureJoin when setting container /etc directory [release-1.27] OCPBUGS-33810: server: use SecureJoin when setting container /etc directory May 31, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 31, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 31, 2024

@kwilczynski: This pull request references Jira Issue OCPBUGS-33810, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
  • expected Jira Issue OCPBUGS-33810 to depend on a bug in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is a manual cherry-pick of #8225

/assign haircommander
/assign kwilczynski

Fix CVE-2024-5154 where a malicious container image could make a symlink of `/proc/mounts` on the host, out of the container's rootfs

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 openshift-eng/jira-lifecycle-plugin repository.

sohankunkerkar
sohankunkerkar approved these changes May 31, 2024
View reviewed changes
Copy link
Member

@sohankunkerkar sohankunkerkar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/retest
/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 31, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 31, 2024
@haircommander
Copy link
Member

haircommander commented May 31, 2024

/approve
/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 31, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, kwilczynski, sohankunkerkar

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

The pull request process is described 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 31, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 902a044 into cri-o:release-1.27 May 31, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 31, 2024

@kwilczynski: Jira Issue OCPBUGS-33810: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-33810 has been moved to the MODIFIED state.

In response to this:

This is a manual cherry-pick of #8225

/assign haircommander
/assign kwilczynski

Fix CVE-2024-5154 where a malicious container image could make a symlink of `/proc/mounts` on the host, out of the container's rootfs

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 openshift-eng/jira-lifecycle-plugin repository.

@kwilczynski kwilczynski deleted the feature/backport-8225-to-release-1.27 branch June 1, 2024 05:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sohankunkerkar sohankunkerkar sohankunkerkar approved these changes

@mrunalp mrunalp Awaiting requested review from mrunalp mrunalp is a code owner

@QiWang19 QiWang19 Awaiting requested review from QiWang19

@wgahnagl wgahnagl Awaiting requested review from wgahnagl

Assignees

@kwilczynski kwilczynski

@haircommander haircommander

@sohankunkerkar sohankunkerkar

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kwilczynski @openshift-ci-robot @haircommander @sohankunkerkar