jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code optimization after review 

Signed-off-by: Lifubang <lifubang@acmcoder.com>
This commit is contained in:
Lifubang 2018-09-03 23:27:31 +08:00
parent d2d226e8f9
commit 4fae8fcce2
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libcontainer/factory_linux.go
View File

@ -359,23 +359,7 @@ func (l *LinuxFactory) loadState(root, id string) (*State, error) {
} }
func (l *LinuxFactory) validateID(id string) error { func (l *LinuxFactory) validateID(id string) error {
if !idRegex.MatchString(id) || id == ".." || id == "." { if id == "." || !idRegex.MatchString(id) || utils.CleanPath(id) != id {
return newGenericError(fmt.Errorf("invalid id format: %v", id), InvalidIdFormat)
}
//For unforeseen invalid id situations, can checked by is SubDir?
rootPath, err := filepath.Abs(l.Root)
if err != nil {
return err
}
containerRoot := filepath.Join(l.Root, id)
rootCheckPath, err := filepath.Abs(filepath.Join(containerRoot, ".."))
if err != nil {
return err
}
if rootPath != rootCheckPath {
return newGenericError(fmt.Errorf("invalid id format: %v", id), InvalidIdFormat) return newGenericError(fmt.Errorf("invalid id format: %v", id), InvalidIdFormat)
} }