From 18f230c524234eb6bce3a9d5b4cd6451aed29f92 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Thu, 15 Sep 2016 17:50:39 -0700 Subject: [PATCH] kuberuntime: fix nil pointer dereference in killPodWithSyncResult --- pkg/kubelet/kuberuntime/kuberuntime_manager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index 3185e764f22..33729240af5 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -668,15 +668,15 @@ func (m *kubeGenericRuntimeManager) killPodWithSyncResult(pod *api.Pod, runningP return } if !isHostNetwork { - teardownNetworkResult := kubecontainer.NewSyncResult(kubecontainer.TeardownNetwork, pod.UID) + teardownNetworkResult := kubecontainer.NewSyncResult(kubecontainer.TeardownNetwork, runningPod.ID) result.AddSyncResult(teardownNetworkResult) // Tear down network plugin with sandbox id if err := m.networkPlugin.TearDownPod(runningPod.Namespace, runningPod.Name, kubecontainer.ContainerID{ Type: m.runtimeName, ID: sandboxID, }); err != nil { - message := fmt.Sprintf("Failed to teardown network for pod %q using network plugins %q: %v", - format.Pod(pod), m.networkPlugin.Name(), err) + message := fmt.Sprintf("Failed to teardown network for pod %s_%s(%s) using network plugins %q: %v", + runningPod.Name, runningPod.Namespace, runningPod.ID, m.networkPlugin.Name(), err) teardownNetworkResult.Fail(kubecontainer.ErrTeardownNetwork, message) glog.Error(message) }