Merge pull request google#453 from rjnagal/docker

Add error checks for netlink read.

Author: vmarmol

utils/cpuload/conn.go

@@ -85,7 +85,10 @@ func (self *Connection) WriteMessage(msg syscall.NetlinkMessage) error {
 }
 
 func (self *Connection) ReadMessage() (msg syscall.NetlinkMessage, err error) {
-	binary.Read(self.rbuf, binary.LittleEndian, &msg.Header)
+	err = binary.Read(self.rbuf, binary.LittleEndian, &msg.Header)
+	if err != nil {
+		return msg, err
+	}
 	msg.Data = make([]byte, msg.Header.Len-syscall.NLMSG_HDRLEN)
 	_, err = self.rbuf.Read(msg.Data)
 	return msg, err

utils/cpuload/netlink.go

@@ -76,7 +76,10 @@ func getFamilyId(conn *Connection) (uint16, error) {
 	msg := prepareFamilyMessage()
 	conn.WriteMessage(msg.toRawMsg())
 
-	resp, _ := conn.ReadMessage()
+	resp, err := conn.ReadMessage()
+	if err != nil {
+		return 0, err
+	}
 	id, err := parseFamilyResp(resp)
 	if err != nil {
 		return 0, err