From 9d815707e226b432ebd38682826a96e7a00cb46e Mon Sep 17 00:00:00 2001
From: Ondra Machacek <omachace@redhat.com>
Date: Thu, 20 Jan 2022 15:08:29 +0100
Subject: Fix nil pointer dereference for configmap optional

This PR fixes nil pointer dereference for configmap optional parameter.
When optional parameter is not passed, the code tried to acces the
parameter which caused nil pointer dereference.

Signed-off-by: Ondra Machacek <omachace@redhat.com>
---
 pkg/specgen/generate/kube/volume.go |  2 +-
 test/e2e/play_kube_test.go          | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/pkg/specgen/generate/kube/volume.go b/pkg/specgen/generate/kube/volume.go
index e52d70092..01f731b60 100644
--- a/pkg/specgen/generate/kube/volume.go
+++ b/pkg/specgen/generate/kube/volume.go
@@ -122,7 +122,7 @@ func VolumeFromConfigMap(configMapVolumeSource *v1.ConfigMapVolumeSource, config
 
 	if configMap == nil {
 		// If the volumeSource was optional, move on even if a matching configmap wasn't found
-		if *configMapVolumeSource.Optional {
+		if configMapVolumeSource.Optional != nil && *configMapVolumeSource.Optional {
 			kv.Source = configMapVolumeSource.Name
 			kv.Optional = *configMapVolumeSource.Optional
 			return kv, nil
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 63c9bf7f3..cbaa8d6a4 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -78,6 +78,25 @@ spec:
         - 24h
 status: {}
 `
+
+var podWithoutConfigMapDefined = `
+apiVersion: v1
+kind: Pod
+metadata:
+  name: testpod1
+spec:
+  containers:
+    - name: alpine
+      image: quay.io/libpod/alpine:latest
+      volumeMounts:
+        - name: mycm
+          mountPath: /mycm
+  volumes:
+    - name: mycm
+      configMap:
+        name: mycm
+`
+
 var sharedNamespacePodYaml = `
 apiVersion: v1
 kind: Pod
@@ -1235,6 +1254,16 @@ var _ = Describe("Podman play kube", func() {
 		}
 	})
 
+	It("podman play kube with non-existing configmap", func() {
+		err := writeYaml(podWithoutConfigMapDefined, kubeYaml)
+		Expect(err).To(BeNil())
+
+		kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
+		kube.WaitWithDefaultTimeout()
+		Expect(kube).Should(Exit(125))
+		Expect(kube.ErrorToString()).To(ContainSubstring("failed to create volume \"mycm\": no such ConfigMap \"mycm\""))
+	})
+
 	It("podman play kube test HostAliases with --no-hosts", func() {
 		pod := getPod(withHostAliases("192.168.1.2", []string{
 			"test1.podman.io",
-- 
cgit v1.2.3-54-g00ecf