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.

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

[release-1.26] CVE-2024-1753, Bump to Buildah v1.26.7 #5450

Conversation

TomSweeneyRedHat
Copy link
Member

This Bumps Buildah to v1.26.7 and addresses CVE-2024-1753
https://issues.redhat.com/browse/RHEL-26773
https://issues.redhat.com/browse/RHEL-26770

What type of PR is this?

/kind api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

None

TomSweeneyRedHat and others added 2 commits April 1, 2024 14:02
Addresses CVE-2024-1753 which allowed a user to write files to the
`/` directory of the host machine if selinux was not enabled.

Signed-off-by: tomsweeneyredhat <[email protected]>
... in layer blobs

When analyzing a layer blob's contents, don't break if the blob has more
zeroes padding it out even after the tar reader thinks it's hit the end
of the archive.

Add more detail to the diagnostic error we print when there's a digest
or length mismatch, too, in case it's triggered by something other than
zero padding.

Don't ignore errors which might be encountered when we try to use skopeo
to copy an image to a directory.

Signed-off-by: Nalin Dahyabhai <[email protected]>
Copy link
Contributor

openshift-ci bot commented Apr 1, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TomSweeneyRedHat

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 label Apr 1, 2024
@TomSweeneyRedHat TomSweeneyRedHat changed the title [release-1/26] CVE-2024-1753, Bump to Buildah v1.26.7 [release-1.26] CVE-2024-1753, Bump to Buildah v1.26.7 Apr 1, 2024
@TomSweeneyRedHat
Copy link
Member Author

At least one of the failures in the test was a network hiccup. I've rerun them.

@TomSweeneyRedHat
Copy link
Member Author

@edsantiago or @nalind Any advice on the breaking conformance tests? This is the only branch that I have run into this. I'm seeing errors like:

[+1125s]     --- FAIL: TestConformance/copy_file_to_root (8.98s)

But I'm not finding a copy_file_to_root test anywhere. Thoughts?

@edsantiago
Copy link
Member

name: "copy file to root",
dockerfile: "Dockerfile.copyfrom_1",
buildahRegex: "[-rw]+.*?/a",
fsSkip: []string{"(dir):a:mtime"},
},

but I have no idea what the test is or what a failure means

@edsantiago
Copy link
Member

Many of the errors I see were fixed by #5257

@TomSweeneyRedHat
Copy link
Member Author

Thanks @edsantiago I'll try adding that tomorrow.

@TomSweeneyRedHat
Copy link
Member Author

Repushed with #5257 included

nalind and others added 2 commits April 4, 2024 18:20
When comparing layer payloads during conformance tests, mask off any
file type bits that the tar headers in the layers might have included.

Signed-off-by: Nalin Dahyabhai <[email protected]>
As the title says.  This will fix Buldah for CVE-2024-1753.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat
Copy link
Member Author

The "Unit tests w/ vfs" failed. The only error was a timeout that I could see, restarted with fingers crossed. However, it looks like the conformance tests are happy now.

@TomSweeneyRedHat
Copy link
Member Author

Hallejuah! Finally, happy green test buttons on this. Can I get a LGTM or two on this please?

@rhatdan
Copy link
Member

rhatdan commented Apr 6, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Apr 6, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 2399bbf into containers:release-1.26 Apr 6, 2024
23 checks passed
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Jul 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants