csi: fix panic in serializing nil allocs in volume API (#8735)

- fix panic in serializing nil allocs in volume API - prevent potential panic in serializing plugin allocs
hashicorp · Aug 25, 2020 · d6ad3be · d6ad3be
1 parent d787c28
commit d6ad3be
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/command/agent/csi_endpoint.go b/command/agent/csi_endpoint.go
@@ -296,7 +296,9 @@ func structsCSIPluginToApi(plug *structs.CSIPlugin) *api.CSIPlugin {
 	}
 
 	for _, a := range plug.Allocations {
-		out.Allocations = append(out.Allocations, structsAllocListStubToApi(a))
+		if a != nil {
+			out.Allocations = append(out.Allocations, structsAllocListStubToApi(a))
+		}
 	}
 
 	return out
@@ -341,11 +343,15 @@ func structsCSIVolumeToApi(vol *structs.CSIVolume) *api.CSIVolume {
 	}
 
 	for _, a := range vol.WriteAllocs {
-		out.Allocations = append(out.Allocations, structsAllocListStubToApi(a.Stub()))
+		if a != nil {
+			out.Allocations = append(out.Allocations, structsAllocListStubToApi(a.Stub()))
+		}
 	}
 
 	for _, a := range vol.ReadAllocs {
-		out.Allocations = append(out.Allocations, structsAllocListStubToApi(a.Stub()))
+		if a != nil {
+			out.Allocations = append(out.Allocations, structsAllocListStubToApi(a.Stub()))
+		}
 	}
 
 	return out