toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15404 from vbatts/vbatts-dm-zero-sized-field

Browse Source 
devicemapper: fix zero-sized field access
Upstream-commit: 6f89a8ee1ba6b598dc1f76e829d6db6f830cdb8e
Component: engine
This commit is contained in:
Alexander Morozov
2015-08-10 09:16:11 -07:00
parent 2db4446de9 48bf8fcaf6
commit 7a08f892e2
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/engine/daemon/graphdriver/devmapper/deviceset.go
View File

@ -1509,12 +1509,16 @@ func (devices *DeviceSet) deactivatePool() error {
if err != nil {
return err
}
if d, err := devicemapper.GetDeps(devname); err == nil {
// Access to more Debug output
logrus.Debugf("[devmapper] devicemapper.GetDeps() %s: %#v", devname, d)
if devinfo.Exists == 0 {
return nil
}
if devinfo.Exists != 0 {
return devicemapper.RemoveDevice(devname)
if err := devicemapper.RemoveDevice(devname); err != nil {
return err
}
if d, err := devicemapper.GetDeps(devname); err == nil {
logrus.Warnf("[devmapper] device %s still has %d active dependents", devname, d.Count)
}
return nil