Fix nil pointer dereference in container spec memory metrics#12492
Merged
fuweid merged 1 commit intocontainerd:mainfrom Nov 7, 2025
Merged
Fix nil pointer dereference in container spec memory metrics#12492fuweid merged 1 commit intocontainerd:mainfrom
fuweid merged 1 commit intocontainerd:mainfrom
Conversation
Add nil checks for Memory.Limit, Memory.Reservation, and Memory.Swap before dereferencing them in extractContainerSpecMetrics. These fields are optional pointers in OCI runtime spec and can be nil when not set. - Memory.Limit: Set from Pod resources.limits.memory - Memory.Reservation: Only set via NRI plugins (rarely used) - Memory.Swap: Set from memory_swap_limit_in_bytes (optional) This prevents potential panic when collecting metrics from containers that don't have all memory limits configured, and makes the code consistent with CPU resource handling and helpers.go. Signed-off-by: You Binhao <[email protected]>
ymichaelson
force-pushed
the
fix-memory-metrics-nil-check
branch
from
19ed9a1 to
6b82f03
Compare
fuweid
approved these changes
Nov 7, 2025
estesp
approved these changes
Nov 7, 2025
github-project-automation
Bot
moved this from Needs Triage
to Review In Progress
in Pull Request Review
dcantah
approved these changes
Nov 7, 2025
github-project-automation
Bot
moved this from Review In Progress
to Done
in Pull Request Review
ChengyuZhu6
pushed a commit
to ChengyuZhu6/containerd
that referenced
this pull request
Nov 14, 2025
…cs-nil-check Fix nil pointer dereference in container spec memory metrics
Member
|
/cherrypick release/2.2 |
akhilerm
added
the
cherry-picked/2.2.x
|
@akhilerm: new pull request created: #12731 DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind bug
What this PR does / why we need it:
This PR fixes a potential nil pointer dereference panic in
extractContainerSpecMetricswhen collecting container resource metrics.The issue occurs when memory resource fields (
Limit,Reservation,Swap) are nil, which can happen when:Reservationis not set (it's only set via NRI plugins)Which issue(s) this PR fixes:
Fixes potential panic when collecting metrics from containers without full memory limit configuration.
Special notes for your reviewer:
This fix makes the memory resource handling consistent with:
helpers.go(lines 296-303)Each pointer field now has an independent nil check before dereferencing.
Does this PR introduce a user-facing change?