From 9cd9d4349dc25a0bd82a9b34f9ade375c6058141 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <lk4d4@docker.com>
Date: Mon, 6 Jun 2016 11:29:47 -0700
Subject: [PATCH] ioutils: fix race in access closeErr in bytespipe

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b32478488ce6d373e44bb8a6c9cb986c773ad48e
Component: engine
---
 components/engine/pkg/ioutils/bytespipe.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/engine/pkg/ioutils/bytespipe.go b/components/engine/pkg/ioutils/bytespipe.go
index eca129be39..72a04f3491 100644
--- a/components/engine/pkg/ioutils/bytespipe.go
+++ b/components/engine/pkg/ioutils/bytespipe.go
@@ -133,8 +133,9 @@ func (bp *BytesPipe) Read(p []byte) (n int, err error) {
 		}
 		bp.wait.Wait()
 		if bp.bufLen == 0 && bp.closeErr != nil {
+			err := bp.closeErr
 			bp.mu.Unlock()
-			return 0, bp.closeErr
+			return 0, err
 		}
 	}