Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/1.6] Added nullptr checks to pkg/cri/server and sbserver #7737

Merged
merged 1 commit into from Nov 30, 2022
Merged

[release/1.6] Added nullptr checks to pkg/cri/server and sbserver #7737

merged 1 commit into from Nov 30, 2022

Conversation

kiashok
Copy link
Contributor

@kiashok kiashok commented Nov 30, 2022

Porting commit 08d5879 from containerd main to release/1.6 branch.

This PR adds nullptr checks before dereferencing pointers in pkg/cri/server/helpers.go copyResourcesToStatus() function. The function was introduced as part of this PR.
While running some hcsshim tests, containerd crashed with a panic due to nullptr dereference and this PR attempts to fix that.

Signed-off-by: Kirtana Ashok Kirtana.Ashok@microsoft.com
(cherry picked from commit 08d5879)
Signed-off-by: Kirtana Ashok Kirtana.Ashok@microsoft.com

Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
(cherry picked from commit 08d5879)
Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
@k8s-ci-robot
Copy link

Hi @kiashok. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@dmcgowan dmcgowan merged commit 3efc787 into containerd:release/1.6 Nov 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants