Include a nil check for the snapshotContent by huffmanca · Pull Request #278 · kubernetes-csi/external-snapshotter

huffmanca · 2020-03-18T15:14:12Z

/kind bug

What this PR does / why we need it:
It's currently possible for the snapshotController to crash when checking snapshot Finalizers if the VolumeSnapshotContent is nil. This PR introduces a simple nil check to prevent the panic.

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

k8s-ci-robot · 2020-03-18T15:14:21Z

Hi @huffmanca. Thanks for your PR.

I'm waiting for a kubernetes-csi 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.

Details

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.

xing-yang · 2020-03-18T16:53:55Z

/ok-to-test

xing-yang · 2020-03-18T16:58:01Z

-			ctrl.setAnnVolumeSnapshotBeingDeleted(content)
+			if content != nil {
+				klog.V(5).Infof("checkandRemoveSnapshotFinalizersAndCheckandDeleteContent: Set VolumeSnapshotBeingDeleted annotation on the content [%s]", content.Name)
+				ctrl.setAnnVolumeSnapshotBeingDeleted(content)


This is called in multiple places. Can you add a nil check inside setAnnVolumeSnapshotBeingDeleted()?
I actually just ran into this yesterday so I added it here:
https://github.com/kubernetes-csi/external-snapshotter/pull/261/files#diff-214a2fc68717c170415a3578536d3b74R1281

I'll remove my change once your PR is merged.

I've updated this to also include the check inside of setAnnVolumeSnapshotBeingDeleted(). I was hitting the panic on line 270 above, when we were printing out the debug statement.

I can remove the name of the content, since it should print this out within setAnnVolumeSnapshotBeingDeleted immediately after it checks for nil now.

This nil check on line 269 can be removed now since you moved the check inside setAnnVolumeSnapshotBeingDeleted()

I removed the nil check here, but I also updated the debug logging to not print the content name. That's where I was hitting the panic

xing-yang · 2020-03-18T17:50:02Z

/lgtm
/approve

k8s-ci-robot · 2020-03-18T17:50:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: huffmanca, xing-yang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [xing-yang]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

xing-yang · 2020-03-19T20:06:02Z

 	if !metav1.HasAnnotation(content.ObjectMeta, utils.AnnVolumeSnapshotBeingDeleted) {
+		if content == nil {
+			return nil
+		}


This check should be moved before the if block. Otherwise we'll still get a nil exception on line 1283 as it references the content. I'm going to revert this PR. Can you please submit a different PR?

Fixed in #279

74502e544 Merge pull request kubernetes-csi#278 from liangyuanpeng/migrate_k8s_testimages 533443055 Merge pull request kubernetes-csi#281 from kubernetes-csi/dependabot/github_actions/actions/checkout-5 458ce146f Bump actions/checkout from 4 to 5 5ec1a52b8 use gcr.io/k8s-staging-test-infra instead of gcr.io/k8s-testimages git-subtree-dir: release-tools git-subtree-split: 74502e544bc6a17820892c0d490e8f0b59462998

119a53c3c Merge pull request kubernetes-csi#294 from andyzhangx/patch-10 7c9aa9ba3 fix: upgrade to go1.25.7 to fix CVE-2026-25679 1e81e752e Merge pull request kubernetes-csi#293 from andyzhangx/patch-9 4dc185057 fix: upgrade to go1.25.7 to fix CVE-2025-61727 b60b9a507 Merge pull request kubernetes-csi#292 from andyzhangx/patch-8 0e4e2ed0d Update Go version from 1.25.5 to 1.25.6 to fix CVE 707a99eca Merge pull request kubernetes-csi#291 from dfajmon/logcheck a9d2b0fb3 Bump logcheck to v0.10.0 d6846630b Merge pull request kubernetes-csi#290 from dfajmon/go-1.25.5 55e527c49 Bump golang to 1.25.5 b12e407cc Merge pull request kubernetes-csi#289 from nixpanic/k8s-v1.34 bbe5e547e Use Kubernetes v1.34 and Kind v0.30 by default 4e9eb2c9e Merge pull request kubernetes-csi#288 from gnufied/add-gnufied-for-csi-approver 064e260d9 Add myself as csi approver c852fa797 Merge pull request kubernetes-csi#287 from andyzhangx/patch-7 bce16c103 fix: upgrade to go1.24.11 to fix CVE-2025-61727 8d1258cce Merge pull request kubernetes-csi#286 from kubernetes-csi/dependabot/github_actions/actions/checkout-6 91e35981a Bump actions/checkout from 5 to 6 294138155 Merge pull request kubernetes-csi#285 from andyzhangx/patch-6 fa8b339e9 fix: upgrade to go1.24.9 to fix CVEs 74502e544 Merge pull request kubernetes-csi#278 from liangyuanpeng/migrate_k8s_testimages 533443055 Merge pull request kubernetes-csi#281 from kubernetes-csi/dependabot/github_actions/actions/checkout-5 458ce146f Bump actions/checkout from 4 to 5 5f38a9075 Merge pull request kubernetes-csi#282 from rhrmo/update-go-1.24.6 579f62421 Update go to 1.24.6 5ec1a52b8 use gcr.io/k8s-staging-test-infra instead of gcr.io/k8s-testimages 74e066a82 Merge pull request kubernetes-csi#279 from Aishwarya-Hebbar/update-csi-prow-version 6f236be7d Update CSI prow driver version to v1.17.0 0ee55894b Merge pull request kubernetes-csi#280 from xing-yang/update_go_1.24.4 9af101534 update to go 1.24.4 f5fec3e36 Merge pull request kubernetes-csi#275 from chrishenzie/emeritus c5d285db8 Remove chrishenzie from kubernetes-csi-reviewers 0a435bf98 Merge pull request kubernetes-csi#274 from andyzhangx/patch-5 cd7b4bba3 Bump golang to 1.24.2 to fix CVE-2025-22871 701dc34bc Merge pull request kubernetes-csi#273 from andyzhangx/patch-4 aeebd30e8 Bump golang to 1.24.0 f277d561f Merge pull request kubernetes-csi#270 from carlory/update-kind-version 6dcb96a51 update default kind version to v0.25.0 git-subtree-dir: release-tools git-subtree-split: 119a53c3cce0c04fd422514252ea62c6ff4e3548

119a53c3c Merge pull request kubernetes-csi#294 from andyzhangx/patch-10 7c9aa9ba3 fix: upgrade to go1.25.7 to fix CVE-2026-25679 1e81e752e Merge pull request kubernetes-csi#293 from andyzhangx/patch-9 4dc185057 fix: upgrade to go1.25.7 to fix CVE-2025-61727 b60b9a507 Merge pull request kubernetes-csi#292 from andyzhangx/patch-8 0e4e2ed0d Update Go version from 1.25.5 to 1.25.6 to fix CVE 707a99eca Merge pull request kubernetes-csi#291 from dfajmon/logcheck a9d2b0fb3 Bump logcheck to v0.10.0 d6846630b Merge pull request kubernetes-csi#290 from dfajmon/go-1.25.5 55e527c49 Bump golang to 1.25.5 b12e407cc Merge pull request kubernetes-csi#289 from nixpanic/k8s-v1.34 bbe5e547e Use Kubernetes v1.34 and Kind v0.30 by default 4e9eb2c9e Merge pull request kubernetes-csi#288 from gnufied/add-gnufied-for-csi-approver 064e260d9 Add myself as csi approver c852fa797 Merge pull request kubernetes-csi#287 from andyzhangx/patch-7 bce16c103 fix: upgrade to go1.24.11 to fix CVE-2025-61727 8d1258cce Merge pull request kubernetes-csi#286 from kubernetes-csi/dependabot/github_actions/actions/checkout-6 91e35981a Bump actions/checkout from 5 to 6 294138155 Merge pull request kubernetes-csi#285 from andyzhangx/patch-6 fa8b339e9 fix: upgrade to go1.24.9 to fix CVEs 74502e544 Merge pull request kubernetes-csi#278 from liangyuanpeng/migrate_k8s_testimages 533443055 Merge pull request kubernetes-csi#281 from kubernetes-csi/dependabot/github_actions/actions/checkout-5 458ce146f Bump actions/checkout from 4 to 5 5f38a9075 Merge pull request kubernetes-csi#282 from rhrmo/update-go-1.24.6 579f62421 Update go to 1.24.6 5ec1a52b8 use gcr.io/k8s-staging-test-infra instead of gcr.io/k8s-testimages 74e066a82 Merge pull request kubernetes-csi#279 from Aishwarya-Hebbar/update-csi-prow-version 6f236be7d Update CSI prow driver version to v1.17.0 0ee55894b Merge pull request kubernetes-csi#280 from xing-yang/update_go_1.24.4 9af101534 update to go 1.24.4 f5fec3e36 Merge pull request kubernetes-csi#275 from chrishenzie/emeritus c5d285db8 Remove chrishenzie from kubernetes-csi-reviewers git-subtree-dir: release-tools git-subtree-split: 119a53c3cce0c04fd422514252ea62c6ff4e3548

119a53c3c Merge pull request kubernetes-csi#294 from andyzhangx/patch-10 7c9aa9ba3 fix: upgrade to go1.25.7 to fix CVE-2026-25679 1e81e752e Merge pull request kubernetes-csi#293 from andyzhangx/patch-9 4dc185057 fix: upgrade to go1.25.7 to fix CVE-2025-61727 b60b9a507 Merge pull request kubernetes-csi#292 from andyzhangx/patch-8 0e4e2ed0d Update Go version from 1.25.5 to 1.25.6 to fix CVE 707a99eca Merge pull request kubernetes-csi#291 from dfajmon/logcheck a9d2b0fb3 Bump logcheck to v0.10.0 d6846630b Merge pull request kubernetes-csi#290 from dfajmon/go-1.25.5 55e527c49 Bump golang to 1.25.5 b12e407cc Merge pull request kubernetes-csi#289 from nixpanic/k8s-v1.34 bbe5e547e Use Kubernetes v1.34 and Kind v0.30 by default 4e9eb2c9e Merge pull request kubernetes-csi#288 from gnufied/add-gnufied-for-csi-approver 064e260d9 Add myself as csi approver c852fa797 Merge pull request kubernetes-csi#287 from andyzhangx/patch-7 bce16c103 fix: upgrade to go1.24.11 to fix CVE-2025-61727 8d1258cce Merge pull request kubernetes-csi#286 from kubernetes-csi/dependabot/github_actions/actions/checkout-6 91e35981a Bump actions/checkout from 5 to 6 294138155 Merge pull request kubernetes-csi#285 from andyzhangx/patch-6 fa8b339e9 fix: upgrade to go1.24.9 to fix CVEs 74502e544 Merge pull request kubernetes-csi#278 from liangyuanpeng/migrate_k8s_testimages 533443055 Merge pull request kubernetes-csi#281 from kubernetes-csi/dependabot/github_actions/actions/checkout-5 458ce146f Bump actions/checkout from 4 to 5 5f38a9075 Merge pull request kubernetes-csi#282 from rhrmo/update-go-1.24.6 579f62421 Update go to 1.24.6 5ec1a52b8 use gcr.io/k8s-staging-test-infra instead of gcr.io/k8s-testimages 74e066a82 Merge pull request kubernetes-csi#279 from Aishwarya-Hebbar/update-csi-prow-version 6f236be7d Update CSI prow driver version to v1.17.0 0ee55894b Merge pull request kubernetes-csi#280 from xing-yang/update_go_1.24.4 9af101534 update to go 1.24.4 f5fec3e36 Merge pull request kubernetes-csi#275 from chrishenzie/emeritus c5d285db8 Remove chrishenzie from kubernetes-csi-reviewers 0a435bf98 Merge pull request kubernetes-csi#274 from andyzhangx/patch-5 cd7b4bba3 Bump golang to 1.24.2 to fix CVE-2025-22871 701dc34bc Merge pull request kubernetes-csi#273 from andyzhangx/patch-4 aeebd30e8 Bump golang to 1.24.0 f277d561f Merge pull request kubernetes-csi#270 from carlory/update-kind-version 6dcb96a51 update default kind version to v0.25.0 git-subtree-dir: release-tools git-subtree-split: 119a53c3cce0c04fd422514252ea62c6ff4e3548

k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 18, 2020

k8s-ci-robot requested review from lpabon and saad-ali March 18, 2020 15:14

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 18, 2020

k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 18, 2020

huffmanca mentioned this pull request Mar 18, 2020

Allows VolumeSnapshot to be deleted if the class isn't found #275

Merged

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 18, 2020

xing-yang reviewed Mar 18, 2020

View reviewed changes

huffmanca force-pushed the check_nil_content branch from fa6d56a to 703d7ac Compare March 18, 2020 17:28

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 18, 2020

Include a nil check for the snapshotContent

806ccc0

huffmanca force-pushed the check_nil_content branch from 703d7ac to 806ccc0 Compare March 18, 2020 17:35

k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 18, 2020

k8s-ci-robot assigned xing-yang Mar 18, 2020

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 18, 2020

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 18, 2020

k8s-ci-robot merged commit bf65357 into kubernetes-csi:master Mar 18, 2020

huffmanca mentioned this pull request Mar 18, 2020

Bug 1814280: UPSTREAM 278: Include a nil check for the snapshotContent openshift/csi-external-snapshotter#16

Merged

xing-yang reviewed Mar 19, 2020

View reviewed changes

huffmanca mentioned this pull request Mar 20, 2020

Bug 1815563: UPSTREAM 278, 279: Include a nil check for the snapshotContent openshift/csi-external-snapshotter#19

Merged

darshansreenivas mentioned this pull request Oct 22, 2025

Release tool update #1340

Merged

akankshapanse mentioned this pull request Mar 16, 2026

Update csi release tools to include updated GO version that addresses CVE-2026-24051 #1393

Open

xing-yang mentioned this pull request Mar 19, 2026

Release tools 8.3 #1400

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Include a nil check for the snapshotContent#278

Include a nil check for the snapshotContent#278
k8s-ci-robot merged 1 commit intokubernetes-csi:masterfrom
huffmanca:check_nil_content

huffmanca commented Mar 18, 2020

Uh oh!

k8s-ci-robot commented Mar 18, 2020

Uh oh!

xing-yang commented Mar 18, 2020

Uh oh!

xing-yang Mar 18, 2020

Uh oh!

huffmanca Mar 18, 2020

Uh oh!

xing-yang Mar 18, 2020

Uh oh!

huffmanca Mar 18, 2020

Uh oh!

xing-yang commented Mar 18, 2020

Uh oh!

k8s-ci-robot commented Mar 18, 2020

Uh oh!

xing-yang Mar 19, 2020

Uh oh!

xing-yang Mar 19, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

huffmanca commented Mar 18, 2020

Uh oh!

k8s-ci-robot commented Mar 18, 2020

Uh oh!

xing-yang commented Mar 18, 2020

Uh oh!

xing-yang Mar 18, 2020

Choose a reason for hiding this comment

Uh oh!

huffmanca Mar 18, 2020

Choose a reason for hiding this comment

Uh oh!

xing-yang Mar 18, 2020

Choose a reason for hiding this comment

Uh oh!

huffmanca Mar 18, 2020

Choose a reason for hiding this comment

Uh oh!

xing-yang commented Mar 18, 2020

Uh oh!

k8s-ci-robot commented Mar 18, 2020

Uh oh!

xing-yang Mar 19, 2020

Choose a reason for hiding this comment

Uh oh!

xing-yang Mar 19, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants