From 98b155379bdca9a9c0e590945fb2500bb2c823a8 Mon Sep 17 00:00:00 2001
From: Brian Goff <cpuguy83@gmail.com>
Date: Tue, 12 Jul 2016 15:30:21 -0400
Subject: [PATCH] Fix panic when meminfo couldn't be read

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 5f7b1b604c9e44477aee196b17fb4b5692cbbaa6)
Signed-off-by: Tibor Vass <tibor@docker.com>
---
 daemon/info.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/daemon/info.go b/daemon/info.go
index ada3aa4508..c9ece28e33 100644
--- a/daemon/info.go
+++ b/daemon/info.go
@@ -51,6 +51,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
 	meminfo, err := system.ReadMemInfo()
 	if err != nil {
 		logrus.Errorf("Could not read system memory info: %v", err)
+		meminfo = &system.MemInfo{}
 	}
 
 	sysInfo := sysinfo.New(true)