Merge pull request containerd#4661 from kevpar/1.4-lcow-tar

fuweid · web-flow · commit 8b8494ec012c · 2020-10-27T19:05:20.000+08:00
[release/1.4] cherry-pick: Read trailing data from tar reader
diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go
@@ -21,6 +21,7 @@ package lcow
 import (
 	"context"
 	"io"
+	"io/ioutil"
 	"os"
 	"path"
 	"time"
@@ -163,6 +164,11 @@ func (s windowsLcowDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mou
 	}
 	outFile.Close()
 
+	// Read any trailing data
+	if _, err := io.Copy(ioutil.Discard, rc); err != nil {
+		return emptyDesc, err
+	}
+
 	err = security.GrantVmGroupAccess(layerPath)
 	if err != nil {
 		return emptyDesc, errors.Wrapf(err, "failed GrantVmGroupAccess on layer vhd: %v", layerPath)
