beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #34792 from runcom/fix-relabel-symlinks

Browse source 
volume: evaluate symlinks before relabeling mount source
This commit is contained in:
Sebastiaan van Stijn 2017-09-27 17:42:23 +02:00 committed by GitHub
commit f60e7aac62
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
volume/volume.go
View file

@ -3,6 +3,7 @@ package volume
import (
"fmt"
"os"
"path/filepath"
"syscall"
"time"
@ -155,13 +156,20 @@ func (m *MountPoint) Setup(mountLabel string, rootIDs idtools.IDPair, checkFun f
return
}
err = label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode))
var sourcePath string
sourcePath, err = filepath.EvalSymlinks(m.Source)
if err != nil {
path = ""
err = errors.Wrapf(err, "error evaluating symlinks from mount source %q", m.Source)
return
}
err = label.Relabel(sourcePath, mountLabel, label.IsShared(m.Mode))
if err == syscall.ENOTSUP {
err = nil
}
if err != nil {
path = ""
err = errors.Wrapf(err, "error setting label on mount source '%s'", m.Source)
err = errors.Wrapf(err, "error setting label on mount source '%s'", sourcePath)
}
}()