Skip to content

Conversation

@TomSweeneyRedHat
Copy link
Member

This addresses bumping crun to v1.2.8, which is a huge jump
for this repository, but it's the first version of runc
with the fix for CVE-2025-52881.

This also fixes CVE-2025-31133 and CVE-2025-52565.

Fixes: https://issues.redhat.com/browse/RHEL-126920, https://issues.redhat.com/browse/RHEL-126922
and partially addresses: https://issues.redhat.com/browse/OCPBUGS-64906

Then bump to Buildah v1.29.6

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

[NO NEW TESTS NEEDED]

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 19, 2025

[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

@TomSweeneyRedHat TomSweeneyRedHat force-pushed the dev/tsweeney/cve-2025-52881-release-1.29 branch 3 times, most recently from 264e6b4 to 0f53b19 Compare November 24, 2025 17:03
@TomSweeneyRedHat
Copy link
Member Author

@timcoding1988 any thoughts on the errors in here? I think I may need to update the AWS creds here too? The smoke test error looks like lint ran out of resources?

[+0015s] ./tests/tools/build/golangci-lint run --deadline=20m --color=always -j1
[+0168s] make: *** [Makefile:199: lint] Killed

@cevich holler if you have thoughts on this.

@cevich
Copy link
Member

cevich commented Nov 25, 2025

I had the exact same problem on my PR. I believe removing this line was what fixed it for me.

Edit: Another thing that may be relevant, on my PR all the "Gb" units were changed to just "G" in my cirrus.yaml, for example.

@TomSweeneyRedHat TomSweeneyRedHat force-pushed the dev/tsweeney/cve-2025-52881-release-1.29 branch from 0f53b19 to de91309 Compare November 25, 2025 19:31
@TomSweeneyRedHat
Copy link
Member Author

@cevich that revive line wasn't there, but I did change the Gb to G and we'll see how that goes.

@TomSweeneyRedHat TomSweeneyRedHat force-pushed the dev/tsweeney/cve-2025-52881-release-1.29 branch from de91309 to e05ed0f Compare November 25, 2025 20:54
@TomSweeneyRedHat
Copy link
Member Author

@cevich, I forgot to add a commit to bump x/tools per an earlier suggestion from @nalind. I think that might turn the trick.

@cevich
Copy link
Member

cevich commented Nov 25, 2025

@TomSweeneyRedHat I'm so sorry: David Shea is off this week and I was looking at picking up for him. I noticed he didn't have a PR for 1.29 and completely forgot you had this PR open already. Didn't even register to me that I had already answered your questions on it. So dumb. 😞

Anyway, I released the Clanker[*] to backport my 1.33 PR (in full) to 1.29 and just pushed that up as #6538 It wasn't my intention to usurp your work here, though, maybe, just maybe, the CI gods will give us some more insights from my PR? Regardless, I'm happy to close and let you continue here if you wish.

[*] Clanker is gen-Z derogatory slang for AI 🤣

@cevich
Copy link
Member

cevich commented Nov 25, 2025

Interesting, the Smoke Test failure on my PR is the same! On my 1.33 PR, I had a similar issue (in appearance) and it definitely went away when I removed revive. So this must be something different.

In the distant past when I encountered this golangci-lint behavior, it was always very frustrating to debug. On some occasions the root cause was the environment not having enough memory. Other times the tool was segfaulting while running some check or another. In all cases, it never gave any feedback it just died (like it is here).

Maybe there's a way to run this tool locally with some added "-v" options to increase the noise?

@TomSweeneyRedHat
Copy link
Member Author

@cevich no worries at all about over-riding this with your own PR. I just know this whole mess will be a slog, so was just trying to move things along.

@TomSweeneyRedHat
Copy link
Member Author

@nalind any thoughts on the smoke test error or best yet, how to make it disappear?

This addresses bumping crun to v1.2.9, which is a huge jump
for this repository, but it's the first version of runc
with the fix for CVE-2025-52881.

This also fixes CVE-2025-31133 and CVE-2025-52565.

Fixes: https://issues.redhat.com/browse/RHEL-126920, https://issues.redhat.com/browse/RHEL-126922
and partially addresses: https://issues.redhat.com/browse/OCPBUGS-64906

The CVEs were fixed in v1.2.8, however, regressions were added to that
release that are now fixed in v1.2.9

Signed-off-by: tomsweeneyredhat <[email protected]>
Stealing from @cevich's work in containers#6520.
In CI, the project and tests are compiled, so therefore require newer
CI/VM images with support for the newer golang requirements.

Signed-off-by: tomsweeneyredhat <[email protected]>
Add GoProxy.  Stolen from @cevich's containers#6520

Signed-off-by: tomsweeneyredhat <[email protected]>
Based on containers#5754 from @kolyshkin

Switch from github.com/syndtr/gocapability/capability to "github.com/moby/sys/capability"
in order to clear a number of warnings picked up after updates.

Signed-off-by: tomsweeneyredhat <[email protected]>
Bump Go from 1.17 to 1.22 in .cirrus.yml and the Makefile files.

Prior, issues were seen in CI like:

```
make vendor
GO111MODULE=on go mod tidy -compat=1.17
go mod tidy: go.mod file indicates go 1.22, but maximum supported version is 1.17
make: *** [Makefile:193: vendor] Error 1
```

Signed-off-by: tomsweeneyredhat <[email protected]>
Bumping golang.org/x/tools to v0.26.0 per @nalind's
suggestion.

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat TomSweeneyRedHat force-pushed the dev/tsweeney/cve-2025-52881-release-1.29 branch from e05ed0f to 507987d Compare November 28, 2025 21:23
TomSweeneyRedHat and others added 3 commits December 2, 2025 16:10
Based on nalind@70b7314

Switch from runc to moby for userns

Signed-off-by: tomsweeneyredhat <[email protected]>
* bump golangci-lint to v1.60.3
* bump golang.org/x/tools to v0.26.0

Signed-off-by: Nalin Dahyabhai <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat TomSweeneyRedHat force-pushed the dev/tsweeney/cve-2025-52881-release-1.29 branch from 507987d to 4abebed Compare December 2, 2025 21:30
Ambient capabilities can't be raised without inheritable ones, and since we
don't raise inheritable, we should not raise ambient either.

This went unnoticed because of a bug in syndtr/gocapability which is
only fixed in its fork (see the next commit).

Amends commit e7e55c9.

Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat TomSweeneyRedHat force-pushed the dev/tsweeney/cve-2025-52881-release-1.29 branch from 4abebed to da6cd95 Compare December 2, 2025 21:35
cevich and others added 2 commits December 4, 2025 17:54
Signed-off-by: Chris Evich <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
Bump Buildah to v1.29.6

Signed-off-by: tomsweeneyredhat <[email protected]>
@TomSweeneyRedHat TomSweeneyRedHat force-pushed the dev/tsweeney/cve-2025-52881-release-1.29 branch from da6cd95 to 4c9b681 Compare December 4, 2025 22:58
@TomSweeneyRedHat
Copy link
Member Author

Closing in favor of #6538 from @cevich

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants