Merge pull request #86277 from yutedz/subpath-walk-nil

Check FileInfo against nil during walk of container dir path
This commit is contained in:
Kubernetes Prow Robot 2019-12-17 04:20:22 -08:00 committed by GitHub
commit a57a8f33b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -240,7 +240,8 @@ func doCleanSubPaths(mounter mount.Interface, podDir string, volumeName string)
return err
}
if info.IsDir() {
// We need to check that info is not nil. This may happen when the incoming err is not nil due to stale mounts or permission errors.
if info != nil && info.IsDir() {
// skip subdirs of the volume: it only matters the first level to unmount, otherwise it would try to unmount subdir of the volume
return filepath.SkipDir
}