Skip to content

[release/2.2] Fix possible panic from WithMediaTypeKeyPrefix#12516

Merged
dmcgowan merged 1 commit intocontainerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-12508-to-release/2.2
Nov 15, 2025
Merged

[release/2.2] Fix possible panic from WithMediaTypeKeyPrefix#12516
dmcgowan merged 1 commit intocontainerd:release/2.2from
k8s-infra-cherrypick-robot:cherry-pick-12508-to-release/2.2

Conversation

@k8s-infra-cherrypick-robot

This is an automated cherry-pick of #12508

/assign dmcgowan

As the same instance of a map is used in context and mutated
directly, this leads to a  situation where:
- Calling WithMediaTypeKeyPrefix from parallel goroutines where
  the context was based on the same base context can trigger a panic.
- A subcontext calling WithMediaTypeKeyPrefix changes the value for
  another context when they both originate from the same base context.

Signed-off-by: Tonis Tiigi <[email protected]>
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

@thaJeztah
Copy link
Member

@dmcgowan PTAL

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Nov 15, 2025
@dmcgowan dmcgowan merged commit efd86f2 into containerd:release/2.2 Nov 15, 2025
52 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Nov 15, 2025
@dmcgowan dmcgowan changed the title [release/2.2] remotes: fix possible panic from WithMediaTypeKeyPrefix [release/2.2] Fix possible panic from WithMediaTypeKeyPrefix Dec 11, 2025
smallprogram added a commit to smallprogram/openwrt_packages that referenced this pull request Jan 29, 2026
Container Runtime Interface (CRI)
 - Redact all query parameters in CRI error logs (containerd/containerd#12546)

Image Distribution
 - Fix image defaults on Darwin to usable configuration (containerd/containerd#12544)
 - Fix possible panic from WithMediaTypeKeyPrefix (containerd/containerd#12516)

Runtime
 - Update runc binary to v1.3.4 (containerd/containerd#12593)
 - Fix parsing of hugetlb..events files (containerd/cgroups#379)

Signed-off-by: David Mandy <[email protected]>
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.

5 participants