Commit graph

23180 commits

Author SHA1 Message Date
Paul Holzinger
2e91ffbc7b
Merge pull request #28617 from TomSweeneyRedHat/dev/tsweeney/v5.2-rhel-cve-2026-34986
[v5.2-rhel] Bump Go Jose to v3.0.5 & v4.1.4, CVE-2026-34986
2026-05-08 12:29:01 +02:00
Tom Sweeney
9f52a112a6 [v5.2-rhel] Bump Go Jose to v3.0.5 & v4.1.4, CVE-2026-34986
Bump Go Jose to v3.0.5 and v4.1.4 to address CVE-2026-34986

Fixes: https://redhat.atlassian.net/browse/OCPBUGS-81797, https://redhat.atlassian.net/browse/OCPBUGS-81805

[NO NEW TESTS NEEDED]

Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
2026-04-29 21:53:38 -04:00
Matt Heon
f34bcadc62
Merge pull request #28203 from timcoding1988/backport-aws-oidc-v5.2-rhel
BackPort for (aws migrate to oidc)
2026-03-05 12:10:48 -05:00
Tim Zhou
32b3041612 migrate to oidc
Signed-off-by: Tim Zhou <tizhou@redhat.com>
2026-03-05 11:28:28 -05:00
Brent Baude
81e6423409
Merge pull request #27882 from TomSweeneyRedHat/dev/tsweeney/cve-2025-47913-v5.2-rhel
[v5.2-rhel] CVE-2025-47913, x/crypto 0.43.0
2026-01-13 15:03:50 -06:00
tomsweeneyredhat
4402e4a2b3 [v5.2-rhel] Bump Fedora in .cirrus
We need a higher version of Go in our Fedora, bump the version to 42
in the ci testing system.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-12 17:56:08 -05:00
tomsweeneyredhat
6a879f93b3 [v5.2-rhel] CVE-2025-47913, x/crypto 0.43.0
This addresses CVE-2025-47913 by bumping golang.org/x/crypto to v0.43.0

Fixes: https://issues.redhat.com/browse/OCPBUGS-67120, https://issues.redhat.com/browse/OCPBUGS-67131

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-08 19:32:15 -05:00
Paul Holzinger
48d53e237a
Merge pull request #27810 from TomSweeneyRedHat/dev/tsweeney/podmanreg_v5.2-rhel
[v5.2-rhel] do not pass volume options as bind mounts options to runtime
2026-01-06 15:25:27 +01:00
Paul Holzinger
e7416d09d0 [v5.2-rhel] do not pass [no]copy as bind mounts options to runtime
Starting with runc 1.3.0 it errors when we pass unknown mount options to
the runtime, the copy/nocopy options are specific to podman when we
mount the volume and are not valid mount options for the runtime.

Fixes: #26938

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-12-19 15:07:24 -05:00
Paul Holzinger
4649aa04a7 [v5.2-rhel] do not pass volume-opt as bind mounts options to runtime
Starting with runc 1.3.0 it errors when we pass unknown mount options to
the runtime, the volume-opt options are specifc to the volume we create
and should not be passed to the mount in the oci spec.

Fixes: #26938

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-12-19 15:07:24 -05:00
Paul Holzinger
a5d3847104
Merge pull request #27735 from TomSweeneyRedHat/dev/tsweeney/cve-2025-52881-v5.2-rhel
[v5.2-rhel] CVE-2025-52881 - runc to v1.2.9
2025-12-10 18:46:49 +01:00
Paul Holzinger
34822b39cf [v5.2-rhel] replace deprecated selinux/label calls
These functions were removed in github.com/opencontainers/selinux
v1.12.0.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-12-10 10:36:02 -05:00
tomsweeneyredhat
ee5e4d8546 [v5.2-rhel] Bump runc 1.2.9, Buildah 1.37.7
Bump runc to v1.2.9, Buildah to v1.37.7 to
address CVE-2025-52881.

Also, remove the runc redirect in go.mod

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-12-10 10:36:02 -05:00
openshift-merge-bot[bot]
3494bbccb3
Merge pull request #27533 from TomSweeneyRedHat/dev/tsweeney/awsbump-v5.2-rhel
[v5.2-rhel] bump aws keys
2025-11-14 11:24:50 +00:00
Tim Zhou
361a4ba964 [v5.2-rhel] rotate aws meta_task keys
Bump the aws meta key as in #27435

Signed-off-by: Tim Zhou <tizhou@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-11-13 16:37:52 -05:00
Tim Zhou
1d45fac6a3 [v5.2-rhel] rotate aws key
Bump the AWS key as in #27341

Signed-off-by: Tim Zhou <tizhou@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-11-13 16:36:06 -05:00
openshift-merge-bot[bot]
24be7a841b
Merge pull request #27022 from TomSweeneyRedHat/dev/tsweeney/CVE-2025-9566-v5.2-rhel
[v5.2-rhel] Backport CVE-2025-9566 fixes
2025-09-09 10:12:38 +00:00
Paul Holzinger
a437d801b0 [v5.2-rhel] test/e2e: add CVE-2025-9566 regression test
Ensure we do not regress again.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-09-08 18:47:58 -04:00
Paul Holzinger
c5f3e589b8 [v5.2-rhel] kube play: don't follow volume symlinks onto the host
For ConfigMap and Secret kube play volumes podman populates the data
from the yaml. However the volume content is not controlled by us and we
can be tricked following a symlink to a file on the host instead.

Fixes: CVE-2025-9566

Fixes: https://issues.redhat.com/browse/OCPBUGS-61265, https://issues.redhat.com/browse/OCPBUGS-61266

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-09-08 18:36:57 -04:00
Paul Holzinger
0074e88afb
Merge commit from fork
[v5.2-rhel] machine init: fix tls check
2025-06-24 15:49:06 +02:00
openshift-merge-bot[bot]
3c6518822e
Merge pull request #26496 from TomSweeneyRedHat/dev/tsweeney/systemcheck_v5.2-rhel
[v5.2-rhel] Skip layer digests for podman system check --quick
2025-06-24 12:57:02 +00:00
Sonny Sasaka
4208690f50 [v5.2-rhel] Skip layer digests for podman system check --quick
podman system check --quick currently only skips layer contents, but
practically it's not much quicker than without the flag.

This changes the flag to also skip checking layer digests which speed up
the check significantly.

In some cases, it is useful to opt for a quicker check if we prioritize
detecting and fixing severe corruption and can tolerate minor damage.

The check option is derived from CRI-O's internal repair:
9e4d86d823/internal/lib/container_server.go (L860)

Fixes: https://issues.redhat.com/browse/OCPBUGS-57982

Cherry Picks: https://github.com/containers/podman/pull/26272

Signed-off-by: Sonny Sasaka <sonnysasaka@gmail.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-06-23 18:20:54 -04:00
Paul Holzinger
a551b70803
machine init: fix tls check
Ensure we verify the TLS connection when pulling the OCI image.

Fixes: CVE-2025-6032
Fixes: https://issues.redhat.com/browse/OCPBUGS-57402
Fixes: https://issues.redhat.com/browse/OCPBUGS-57407

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit 726b506acc)
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-06-23 18:04:31 +02:00
openshift-merge-bot[bot]
da46fda577
Merge pull request #25852 from TomSweeneyRedHat/dev/tsweeney/cleantmp_v5.2-rhel
[v5.2-rhel] Remove persist directory when cleaning up Conmon files
2025-04-10 23:01:17 +00:00
Matt Heon
bf1758ae48 [v5.2-rhel] Remove persist directory when cleaning up Conmon files
This seems to have been added as part of the cleanup of our
handling of OOM files, but code was never added to remove it, so
we leaked a single directory with an exit file and OOM file per
container run. Apparently have been doing this for a while - I'd
guess since March of '23 - so I'm surprised more people didn't
notice.

Fixes #25291

Fixes: https://issues.redhat.com/browse/RHEL-86866

Signed-off-by: Matt Heon <mheon@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-04-10 18:45:37 -04:00
openshift-merge-bot[bot]
a2d774cd66
Merge pull request #25590 from Honny1/v5.2-rhel-fix-hc-inf-log
[v5.2-rhel] Fix HealthCheck log destination, count, and size defaults
2025-03-17 11:21:26 +00:00
Jan Rodák
ccd06974de
[v5.2-rhel] Fix HealthCheck log destination, count, and size defaults
GoLang sets unset values to the default value of the type. This means that the destination of the log is an empty string and the count and size are set to 0. However, this means that size and count are unbounded, and this is not the default behavior.

Fixes: https://github.com/containers/podman/issues/25473
Fixes: https://issues.redhat.com/browse/RHEL-83558

Signed-off-by: Jan Rodák <hony.com@seznam.cz>
(cherry picked from commit fff42ac232)
Signed-off-by: Jan Rodák <hony.com@seznam.cz>
2025-03-14 20:21:57 +01:00
openshift-merge-bot[bot]
ea1bef49b8
Merge pull request #25576 from Luap99/v5.2-rhel-crypto
[v5.2-rhel] CVE-2025-22869: replace crypto with github.com/openshift/golang-crypto@v0.33.openshift.1
2025-03-14 18:34:29 +00:00
Paul Holzinger
8671577b82
vendor: replace crypto with github.com/openshift/golang-crypto@v0.33.openshift.1
The go 1.23 build requirement is to new for the older branches, switch
to a fork maintained by openshift.

Fixes: CVE-2025-22869
Fixes: https://issues.redhat.com/browse/RHEL-81318
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-13 17:39:11 +01:00
Paul Holzinger
848fc9eedc
Revert "vendor: bump to golang.org/x/crypto@v0.36.0"
This reverts commit 5f0ffedba2.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-13 17:38:39 +01:00
openshift-merge-bot[bot]
602a296829
Merge pull request #25539 from Luap99/v5.2-rhel-crypto
[v5.2-rhel] CVE-2025-22869: bump to golang.org/x/crypto@v0.36.0
2025-03-12 08:47:16 +00:00
Paul Holzinger
5f0ffedba2
vendor: bump to golang.org/x/crypto@v0.36.0
Fixes: CVE-2025-22869
Fixes: https://issues.redhat.com/browse/RHEL-81318
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-11 19:18:09 +01:00
Paul Holzinger
3dbf9a07f6
remove packit jobs
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-11 19:18:03 +01:00
Paul Holzinger
8ef6fb8633
cirrus: only run single build
Update cirrus.yml to the latest image based of 5.4-rhel, then disable
validate as there no point for it when we do backports. And only
perform a single build on the f41.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-03-11 19:18:02 +01:00
openshift-merge-bot[bot]
bd4ad3b989
Merge pull request #25457 from TomSweeneyRedHat/dev/tsweeney/cve-2025-27144-v5.2-rhel
[v5.2-rhel] CVE-2025-27144
2025-03-04 15:49:15 +00:00
tomsweeneyredhat
34f8d25733 [v5.2-rhel] CVE-2025-27144
This addresses CVE-2025-27144, bumping github.com/go-jose/go-jose/v3 to v3.0.4
and github.com/go-jose/go-jose/v4 to v4.0.5.

Fixes: https://issues.redhat.com/browse/OCPBUGS-51250, https://issues.redhat.com/browse/OCPBUGS-51249

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-03-03 20:56:22 -05:00
openshift-merge-bot[bot]
173b20bfee
Merge pull request #25095 from TomSweeneyRedHat/dev/tsweeney/cve-2024-11218-v5.2-rhel
[v5.2-rhel] CVE-2024-11218, Bump Buildah to v1.37.6
2025-01-23 10:32:41 +00:00
tomsweeneyredhat
6ce927fb73 [v5.2-rhel] CVE-2024-11218, Bump Buildah to v1.37.6
This addresses CVE-2024-11218, a Buildah based CVE.

Fixes: https://issues.redhat.com/browse/RHEL-67606

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-01-22 16:56:53 -05:00
openshift-merge-bot[bot]
76d169058b
Merge pull request #24591 from giuseppe/backport-5.2-idmap
[5.2-rhel] libpod: fix volume copyup with idmap | convert owner IDs only with :idmap
2025-01-16 22:55:40 +00:00
Giuseppe Scrivano
b00c7f22ca
libpod: convert owner IDs only with :idmap
convert the owner UID and GID into the user namespace only when
":idmap" mount is used.

This changes the behaviour of :idmap with an empty volume.  Now the
existing directory ownership is copied up as in the other case.

Closes: https://github.com/containers/podman/issues/23347
Closes: https://issues.redhat.com/browse/RHEL-67842

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 432325236b)
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2025-01-10 12:34:15 +01:00
Ed Santiago
5cf92f9827
CI: enable root user namespaces
Signed-off-by: Ed Santiago <santiago@redhat.com>
(cherry picked from commit 7bb3b83c17)
2025-01-10 12:34:15 +01:00
Giuseppe Scrivano
941c489ec2
libpod: fix volume copyup with idmap
if idmap is specified for a volume, reverse the mappings when copying
up from the container, so that the original permissions are maintained.

Closes: https://github.com/containers/podman/issues/23467

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 3ae1568933)
2025-01-10 12:34:15 +01:00
openshift-merge-bot[bot]
e40738bd34
Merge pull request #24216 from Honny1/dev/jrodak/healthcheck-log
[v5.2-rhel] Add --health-max-log-count, --health-max-log-size, --health-log-destination flags
2024-11-01 18:15:42 +00:00
openshift-merge-bot[bot]
39171ac787
Merge pull request #24397 from TomSweeneyRedHat/dev/tsweeney/accel299-5.2-rhel
[v5.2-rhel] Fix exposed ports
2024-10-29 09:39:56 +00:00
tomsweeneyredhat
4217b729ce [v5.2-rhel] libpod: exposed port use old loop syntax
An additional tweak from @Luap99 in #24333
regarding the looping in libpod/container_inspect.go.

The range over int syntax was only added in go 1.22, this branch is
currently build with go 1.21 in RHEL so we need to convert it back to
the old syntax.

And add the missing "fmt" import in the test file.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-10-28 18:54:46 -04:00
Matt Heon
b54c2c4781 [v5.2-rhel] Exposed ports are only included when not --net=host
Undoing some of my own work here from #24090 now that we have the
ExposedPorts field implemented in inspect. I considered a revert
of that patch, but it's still needed as without it we'd be
including exposed ports when --net=container which is not
correct.

Basically, exposed ports for a container should always go in the
new ExposedPorts field we added. They sometimes go in the Ports
field in NetworkSettings, but only when the container is not
net=host and not net=container. We were always including exposed
ports, which was not correct, but is an easy logical fix.

Also required is a test change to correct the expected behavior
as we were testing for incorrect behavior.

Fixes https://issues.redhat.com/browse/RHEL-60382

Signed-off-by: Matt Heon <mheon@redhat.com>
(cherry picked from commit 8061553c0f)
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-10-28 18:07:55 -04:00
Matt Heon
d0b8dbdfe6 [v5.2-rhel] Add ExposedPorts to Inspect's ContainerConfig
A field we missed versus Docker. Matches the format of our
existing Ports list in the NetworkConfig, but only includes
exposed ports (and maps these to struct{}, as they never go to
real ports on the host).

Fixes https://issues.redhat.com/browse/RHEL-60382

Signed-off-by: Matt Heon <mheon@redhat.com>
(cherry picked from commit edc3dc5e11)
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-10-28 17:58:08 -04:00
Matt Heon
90014aa560 [v5.2-rhel] Include exposed ports in inspect output ...
when net=host

Previously, we didn't bother including exposed ports in the
container config when creating a container with --net=host. Per
Docker this isn't really correct; host-net containers are still
considered to have exposed ports, even though that specific
container can be guaranteed to never use them.

We could just fix this for host container, but we might as well
make it generic. This patch unconditionally adds exposed ports to
the container config - it was previously conditional on a network
namespace being configured. The behavior of `podman inspect` with
exposed ports when using `--net=container:` has also been
corrected. Previously, we used exposed ports from the container
sharing its network namespace, which was not correct. Now, we use
regular port bindings from the namespace container, but exposed
ports from our own container.

Fixes https://issues.redhat.com/browse/RHEL-60382

Signed-off-by: Matt Heon <mheon@redhat.com>
(cherry picked from commit a619c03eff)
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2024-10-28 17:47:30 -04:00
openshift-merge-bot[bot]
d3d8756c5d
Merge pull request #24355 from Luap99/cirrus-remove-tests-5.2
[v5.2-rhel] cirrus: remove functional tests
2024-10-24 12:20:48 +00:00
Paul Holzinger
0ed2c91b6e
cirrus: remove functional tests
As discussed at the cabal October 8, 2024 we have no need for these
tests on RHEL branches. The work to maintain them is higher than it is
worth it. We also do not test RHEL but rather some outdated frozen
fedora image build from the time we created the branch.

Therefore we gain little value from them especially as all the internal
Red Hat QE is testing it anyways again on the proper RHEL builds.

So simply delete all the stuff we no longer need:
 - alt builds, no point in windows/macos testing and other arches
 - all the functional tests
 - the build success task (not needed as there is nothing after it
   anymore)
 - the swagger task, we do not use the swagger from the rhel branches

Fixes: https://issues.redhat.com/browse/RUN-2315

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-10-24 13:40:10 +02:00