Commit graph

25699 commits

Author SHA1 Message Date
Lokesh Mandvekar
1542e14ff4
Merge pull request #28530 from TomSweeneyRedHat/dev/tsweeney/cve-2026-34986-v5.6-rhel
[v5.6-rhel] Bump Go Jose to v4.1.4, CVE-2026-34986
2026-04-22 15:41:30 -04:00
Tom Sweeney
5a762a6761 [v5.6-rhel] Bump Go Jose to v4.1.4, CVE-2026-34986
Bump github.com/go-jose/go-jose/v4 to v4.1.4 to address CVE-2026-34986.

Fixes: https://redhat.atlassian.net/browse/RHEL-165004, https://redhat.atlassian.net/browse/RHEL-165032

Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
2026-04-17 14:57:11 -04:00
Lokesh Mandvekar
19ea4e0518
Merge pull request #28540 from timcoding1988/backport-aws-oidc-v5.6-rhel
[v5.6-rhel] Backport aws OIDC
2026-04-17 14:21:16 -04:00
Tim Zhou
827206c182 [v5.6-rhel] Backport aws OIDC
Switch from encrypted AWS credentials to OIDC authentication
for Cirrus CI AWS EC2 instances (aarch64 builds).

(cherry picked from commit 64a3e31ab9)

Signed-off-by: Tim Zhou <tizhou@redhat.com>
2026-04-17 11:52:19 -04:00
Paul Holzinger
adc679a0a3
Merge pull request #28020 from TomSweeneyRedHat/dev/tsweeney/lengthen_system_test
[v5.6-rhel] test/system: fix test race in exec leak check
2026-02-04 12:54:35 +01:00
Paul Holzinger
2fe12cf6e0 [v5.6-rhel] test/system: fix test race in exec leak check
On very slow systems it can be that it takes over 5s after the sleep
process was started and until the find_exec_pid_files function finds the
file. This was observed on a ppc64le machine by Red Hat QE.

Just making the sleep longer should fix that problem and it doesn't
really effect the total test time because we stop the container
afterwards so there is no extra delay added with this either.

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

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit 39750faab3)
Signed-off-by: Tom Sweeney <tomsweney@redhat.com>
2026-02-03 17:30:27 -05:00
Paul Holzinger
1dce7a7daf
Merge pull request #27937 from TomSweeneyRedHat/dev/tsweeney/AF569-rhel-5.6
[v5.6-rhel] libpod: fix workdir MkdirAll() all check
2026-01-23 13:07:49 +01:00
Paul Holzinger
bda9bde787 [v5.6-rhel] libpod: simplify resolveWorkDir()
The code checks for isPathOnVolume and isPathOnMount so we can just use
the SecureJoin here directly to check for path existance.

Then instead of walking symlinks and trying to guess if they are on a
mount just assume if it is a link (path is different from the normal
joined one) then don't error out early and let the OCI runtime deal with
it. The runtime does produce a less readable error but it still fails
and we have much less fragile code.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit d18e44e9ab)
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-22 15:02:14 -05:00
Paul Holzinger
bd01c413cf [v5.6-rhel] libpod: fix workdir MkdirAll() all check
MkdirAll can fail with EEXIST when the path is a symlink and the target
doesn't exist. As such we should ignore the error.

Note there is something fundemantal wrong here with the path access as
it is following the symlink to the host, however it is only for a
stat() so it is not an security issue here.

Fixes: 637c264e2e ("fix issues found by nilness")

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit 7b1be7f177)
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-22 14:58:33 -05:00
Ashley Cui
360c775708
Merge pull request #27909 from TomSweeneyRedHat/dev/tsweeney/AF599-rhel-5.6
[v5.6-rhel] podman system migrate fixes when pause process and conmon got killed
2026-01-16 10:58:30 -05:00
Paul Holzinger
c2b4757a2c [v5.6-rhel] rootless_linux.c: use shortcut for system commands
There doesn't seem any reason why the system commands should not join
the userns. In particular the main commands use ParentNSRequired and
UnshareNSRequired when they don't want to be joined to the main userns.
Since the system command don't set these the go code does the join and
re-exec anyway so might as well use the shortcut to speed that up.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-15 14:31:10 -05:00
Paul Holzinger
fddf28a38b [v5.6-rhel] SetupRootless handle case where conmon pid are not valid
When trying to join the conmon pid to recreate the pause process based
on the namespace it can be that the pid is no longer valid, i.e. when
conmon crashed or was killed.

Currently we have a big issue that can be reproduced using:
$ podman run -d quay.io/libpod/testimage:20241011 sleep 100
$ killall -9 conmon
$ killall catatonit

All commands would fail as we keep trying to rejoin the namespace of the
non existing conmon process.

So to address that fall back to creating a new namespace if we fail to
join the conmon pids.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-15 14:30:31 -05:00
Paul Holzinger
0ec14857e6 [v5.6-rhel] preallocate paths in SetupRootless
Just a minor improvement as we know the size needed for the slice we can
allocate it only once instead of the append having to resize it.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-15 14:22:08 -05:00
Paul Holzinger
0484ddf7a2 [v5.6-rhel] fix noMoveProcess in SetupRootless
Based on the description in commit 63ef557 this was added so that the
migrate command does not move the pause process into a separate cgroup.

It should however not disable the rejoining of the userns when the pause
process join failed. BEcause of this we end up calling migrate without a
userns and that then can fail if there are actual contianer it tries to
cleanup.

Fixes: 63ef5576ed ("command: migrate doesn't move process to cgroup")

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-15 14:21:21 -05:00
Paul Holzinger
92aeea7991 [v5.6-rhel] use return error handling in SetupRootless
There is no good reason to use logrus and os.Exit() here, other parts of
this function already return the error so do the same. The main podman
process will exit then with the normal formatted error message.

And also log an error about the last return which should never happen as
we should have exited above if the re-exec worked or errored out.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-15 14:20:09 -05:00
Paul Holzinger
b194cd996e
Merge pull request #27884 from ypu/backport-build-test-fix
[v5.6-rhel] test/system: remove apk from build
2026-01-09 14:27:14 +01:00
Paul Holzinger
c37ae587b1 [v5.6-rhel] test/system: remove apk from build
We do not use that package that we install for the test anyway and doing
this networking connection is causing heavy flakes at the moment.

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

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: Yiqiao Pu <ypu@redhat.com>
2026-01-09 13:53:08 +08:00
Paul Holzinger
0a20b845f6
Merge pull request #27870 from TomSweeneyRedHat/dev/tsweeney/cve-2025-47913-v5.6-rhel
[v5.6-rhel] CVE-2025-47913 crypto to 0.43
2026-01-07 13:09:48 +01:00
tomsweeneyredhat
9054b21f2c [v5.6-rhel] Squash lint error is tests
With the bump in Go, a systemd test started squawking about
a lint error.  I took the quick way out and squished the error.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-06 18:14:59 -05:00
tomsweeneyredhat
51906a2c76 [v5.6-rhel] CVE-2025-47913 crypto to 0.43
Bump Buildah to v1.41.8 and golang.org/x/crypto to v0.43.0
to fix CVE-2025-47913

Fixes: https://issues.redhat.com/browse/RHEL-134793,
https://issues.redhat.com/browse/RHEL-134778

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2026-01-06 18:14:52 -05:00
Paul Holzinger
a58af02f3a
Merge pull request #27755 from TomSweeneyRedHat/dev/tsweeney/runc-1.2.9-v5.6-rhel
[v5.6-rhel] Bump runc to v1.3.4
2025-12-12 11:51:56 +01:00
tomsweeneyredhat
2b876a2e09 [v5.6-rhel] Bump runc to v1.3.4
Bump runc to v1.3.4 to take care of some regressions brought
about by recent CVE fixes.

Fixes: https://issues.redhat.com/browse/RHEL-132825,
https://issues.redhat.com/browse/RHEL-132830

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-12-11 16:17:47 -05:00
openshift-merge-bot[bot]
3bf531332c
Merge pull request #27652 from TomSweeneyRedHat/dev/tsweeney/runc-vol-mnt-v5.6-rhel
[v5.6-rhel] do not pass volume options as bind mounts options to runtime
2025-12-02 11:12:49 +00:00
Paul Holzinger
1e4a59dc55 [v5.6-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
Fixes: https://issues.redhat.com/browse/RHEL-132532,
https://issues.redhat.com/browse/RHEL-132531

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-12-01 20:54:58 -05:00
Paul Holzinger
7fda4dfc00 [v5.6-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-01 20:53:10 -05:00
openshift-merge-bot[bot]
279100774a
Merge pull request #27471 from TomSweeneyRedHat/dev/tsweeney/cve-2025-52881-v5.6-rhel
[v5.6-rhel] Bump runc to v1.3.3 - CVE-2025-52881
2025-11-07 18:45:02 +00:00
Paul Holzinger
90eeef779e [v5.6-rhel] fix lint issues with github.com/cyphar/filepath-securejoin
The old location is deprecated and has been removed in v0.6.0 even. I
did this as extra commit to make cherry-picking easier.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-11-07 11:57:03 -05:00
tomsweeneyredhat
c0d8abc35e [v5.6-rhel] Bump runc to v1.3.3 - CVE-2025-52881
Bump runc to v1.3.3 to address CVE-2025-52881
Also fixes CVE-2025-31133 and CVE-2025-52565

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

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-11-07 11:53:54 -05:00
openshift-merge-bot[bot]
1cf61c4878
Merge pull request #27465 from Luap99/v5.6-rhel
[v5.6-rhel] rotate aws keys and remove functional tests
2025-11-07 15:36:17 +00:00
Paul Holzinger
7795b6c8de
cirrus: remove functional tests
As discussed at the cabal October 8, 2024 we have no need for these
tests on RHEL branches.

See commit 0ed2c91 for more details.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-11-07 12:04:15 +01:00
Tim Zhou
fd7340f92c
rotate aws meta_task keys
Signed-off-by: Tim Zhou <tizhou@redhat.com>
(cherry picked from commit f06f77468d)
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-11-07 11:53:21 +01:00
Tim Zhou
ed55e07eb8
rotate aws key
Signed-off-by: Tim Zhou <tizhou@redhat.com>
(cherry picked from commit 2cfd526ec8)
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2025-11-07 11:53:21 +01:00
openshift-merge-bot[bot]
61231e1f80
Merge pull request #27200 from TomSweeneyRedHat/dev/tsweeney/v5.6-rhel-buildah-1.45.5
[v5.6-rhel] Bump to Buildah v1.41.5
2025-10-01 18:05:26 +00:00
tomsweeneyredhat
8d6f12e870 [v5.6-rhel] Bump to Buildah v1.41.5
Vendor Buildah v1.41.5 into Podman v5.6.  This addresses a build
secret mount issue first noted in https://github.com/containers/buildah/issues/6361

Fixes: https://issues.redhat.com/browse/RHEL-116091,
https://issues.redhat.com/browse/RHEL-116090

ZeroDay cards for RHEL 9.7/10.1

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-09-30 14:00:06 -04:00
openshift-merge-bot[bot]
c5a37353db
Merge pull request #26989 from TomSweeneyRedHat/dev/tsweeney/b1.41.4_v5.6-rhel
[v5.6-rhel] Bump c/buildah v1.41.4, and ...
2025-09-19 10:03:41 +00:00
tomsweeneyredhat
b641fe8069 [v5.6-rhel] Bump c/buildah v1.41.4, and ...
c/storage v1.59.1, c/common v0.64.2, and ulikunitz/xv v0.5.12

Addresses: CVE-2025-58058

Fixes: https://issues.redhat.com/browse/RHEL-111076,
https://issues.redhat.com/browse/RHEL-111077

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-09-10 13:27:37 -04:00
openshift-merge-bot[bot]
7078b79085
Merge pull request #27020 from TomSweeneyRedHat/dev/tsweeney/CVE-2025-9566-v5.6-rhel
[v5.6-rhel] Backport CVE-2025-9566 fixes
2025-09-09 10:09:54 +00:00
Paul Holzinger
f4113c7de3 [v5.6-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 17:24:51 -04:00
Paul Holzinger
75ffb356d8 [v5.6-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/RHEL-113140, https://issues.redhat.com/browse/RHEL-113151

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-09-08 17:06:14 -04:00
openshift-merge-bot[bot]
56f1962fb0
Merge pull request #26878 from TomSweeneyRedHat/dev/tsweeney/pick_26861
[v5.6-rhel] podman events: show network create/remove event with jour…
2025-08-21 12:07:09 +00:00
Paul Holzinger
8069823db4 [v5.6-rhel] podman events: show network create/remove event with journald
In the journald driver there is a bug where the network event
attributes are not preserved. This causes the network driver to be
missing and that in turn causes the ToHumanReadable() function to print
an empty line. Fix it by making sure we preserve the network driver in
the event attributes.

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

Cherry Pick Fixes: https://issues.redhat.com/browse/RHEL-110317,
https://issues.redhat.com/browse/RHEL-110318

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-08-20 14:34:43 -04:00
Matt Heon
da671ef6cf
Bump to v5.6.0
Signed-off-by: Matt Heon <mheon@redhat.com>
2025-08-15 09:42:35 -04:00
openshift-merge-bot[bot]
a8e167574d
Merge pull request #26832 from mheon/release_notes_560
Update release notes for v5.6.0 final release
2025-08-15 13:37:41 +00:00
Matt Heon
98c3228471 Update release notes for v5.6.0 final release
Signed-off-by: Matt Heon <mheon@redhat.com>
2025-08-15 09:17:43 -04:00
openshift-merge-bot[bot]
0819ecee86
Merge pull request #26828 from TomSweeneyRedHat/dev/tsweeney/buildah_1.41.3
[v5.6] Bump to Buildah v1.41.3
2025-08-15 13:10:25 +00:00
tomsweeneyredhat
43cb0db93b [v5.6] Bump Buildah to v1.41.3
Bump Buildah to v1.41.3 in preparation for Podman v5.6.0. This vendoring also
cures a last minute issue in the Buildah build code.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-08-14 15:47:52 -04:00
tomsweeneyredhat
f6584e443a [v5.6] Reverse skipped test for 26773
An issue was found late in Podman v5.6 RC2 and it was reported
in #26773.  The failing test was changed so that it was skipped.
This commit renables that test as the fix should be contained
in Buildah 1.41.3.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-08-14 15:47:18 -04:00
openshift-merge-bot[bot]
ab7c7cbc57
Merge pull request #26806 from openshift-cherrypick-robot/cherry-pick-26788-to-v5.6
[v5.6] Add BoltDB deprecation notice
2025-08-11 21:36:38 +00:00
Matt Heon
3354423c0d Add a deprecation notice for users of BoltDB
Right now, only log-level=info, so not shown by default. We can
continue to up this in subsequent releases to convince folks of
the urgency of switching.

Resolves https://issues.redhat.com/browse/RUN-3343

Signed-off-by: Matt Heon <mheon@redhat.com>
2025-08-11 19:44:59 +00:00
openshift-merge-bot[bot]
771be205f6
Merge pull request #26792 from podmanbot/bump-5.6.0-dev
Bump Podman to v5.6.0-dev
2025-08-09 15:18:22 +00:00