Fix nil deref if no shim options were specified #1398
Merged
Conversation
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
This fixes a nil deref possible if no shim options for the runtime
specified were supplied. For example:
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runhcs-wcow-process.options]
vs.
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runhcs-wcow-process.options]
SandboxIsolation = 0
Signed-off-by: Daniel Canter <[email protected]>
Member
|
I'm 90% sure we've fixed this same issue in the past. Can we add a test that covers this case? |
kevpar
reviewed
May 13, 2022
Contributor
Author
@kevpar Agree. We could add a cri-containerd test, but we don't run those on CI here yet. Or did you have something else in mind that I might be brain farting on? |
Change initialization of shim options so we don't need to check nil Signed-off-by: Daniel Canter <[email protected]>
helsaawy
approved these changes
May 17, 2022
anmaxvl
approved these changes
May 19, 2022
anmaxvl
added a commit
that referenced
this pull request
Feb 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
This fixes a nil deref possible if no shim options for the runtime
specified were supplied. For example:
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runhcs-wcow-process.options]
vs.
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runhcs-wcow-process.options]
SandboxIsolation = 0