rbd: fixed csi-rbdplugin crashes when decoding volume ID failed

Signed-off-by: HF <crazytaxii666@gmail.com>
ceph · Sep 5, 2023 · 80ad5b6 · 80ad5b6
1 parent b3ef867
commit 80ad5b6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go
@@ -922,7 +922,11 @@ func (cs *ControllerServer) DeleteVolume(
 	}
 
 	rbdVol, err := GenVolFromVolID(ctx, volumeID, cr, req.GetSecrets())
-	defer rbdVol.Destroy()
+	defer func() {
+		if rbdVol != nil {
+			rbdVol.Destroy()
+		}
+	}()
 	if err != nil {
 		return cs.checkErrAndUndoReserve(ctx, err, volumeID, rbdVol, cr)
 	}