[release/2.2] Fix nil pointer dereference in container spec memory metrics when memory constraints are not fully configured#12731
Merged
fuweid merged 1 commit intocontainerd:release/2.2from Dec 30, 2025
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]>
akhilerm
approved these changes
Dec 27, 2025
Member
|
/cc @AkihiroSuda |
fuweid
approved these changes
Dec 30, 2025
1 task
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
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.
This is an automated cherry-pick of #12492
/assign akhilerm
Fixes: #12730