Skip to content

Conversation

@k8s-infra-cherrypick-robot

This is an automated cherry-pick of #12593

/assign dmcgowan

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM if green

@kavinnath
Copy link

Looks like Fuzzing broken..

('/tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager', CompletedProcess(args=['bad_build_check', '/tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager'], returncode=1, stdout=b'BAD BUILD: /tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager seems to have either startup crash or exit:\nsysctl: setting key "vm.mmap_rnd_bits", ignoring: Read-only file system\n/tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager -- -rss_limit_mb=2560 -timeout=25 -seed=1337 -runs=4 < /dev/null\n/tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager: /lib/x86_64-linux-gnu/libc.so.6: version GLIBC_2.32\' not found (required by /tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager)\n/tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager: /lib/x86_64-linux-gnu/libc.so.6: version GLIBC_2.34' not found (required by /tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager)\n/tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.38' not found (required by /tmp/not-out/tmpyea_evy4/fuzz_FuzzLeaseManager)\n', stderr=b''))

Copy link
Member

@austinvazquez austinvazquez left a comment

Choose a reason for hiding this comment

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

LGTM

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Dec 4, 2025
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM
just a rebase for the fuzzer fix

This update includes a fix for a regression introduced in CVE-2025-52881
mitigation patches where the `mode=` argument was incorrectly applied to
tmpfs mounts regardless of whether the target path existed.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@mikebrow mikebrow force-pushed the cherry-pick-12593-to-release/1.7 branch from a8bf394 to 34b89a5 Compare December 8, 2025 00:28
@dmcgowan dmcgowan merged commit a839d03 into containerd:release/1.7 Dec 8, 2025
92 of 94 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Dec 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

9 participants