github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4401 from smowafy/parse-id-mappings

Browse Source 
parseIDMapping: accept 32-bit IDs
This commit is contained in:
Maksym Pavlenko
2020-07-21 12:00:59 -07:00
committed by GitHub
parent ec05460c1d 96099550b5
commit e6306f9fdf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/ctr/commands/run/run_unix.go
View File

@@ -289,15 +289,15 @@ func parseIDMapping(mapping string) (specs.LinuxIDMapping, error) {
if len(parts) != 3 { if len(parts) != 3 {
return specs.LinuxIDMapping{}, errors.New("user namespace mappings require the format `container-id:host-id:size`") return specs.LinuxIDMapping{}, errors.New("user namespace mappings require the format `container-id:host-id:size`")
} }
cID, err := strconv.ParseUint(parts[0], 0, 16) cID, err := strconv.ParseUint(parts[0], 0, 32)
if err != nil { if err != nil {
return specs.LinuxIDMapping{}, errors.Wrapf(err, "invalid container id for user namespace remapping") return specs.LinuxIDMapping{}, errors.Wrapf(err, "invalid container id for user namespace remapping")
} }
hID, err := strconv.ParseUint(parts[1], 0, 16) hID, err := strconv.ParseUint(parts[1], 0, 32)
if err != nil { if err != nil {
return specs.LinuxIDMapping{}, errors.Wrapf(err, "invalid host id for user namespace remapping") return specs.LinuxIDMapping{}, errors.Wrapf(err, "invalid host id for user namespace remapping")
} }
size, err := strconv.ParseUint(parts[2], 0, 16) size, err := strconv.ParseUint(parts[2], 0, 32)
if err != nil { if err != nil {
return specs.LinuxIDMapping{}, errors.Wrapf(err, "invalid size for user namespace remapping") return specs.LinuxIDMapping{}, errors.Wrapf(err, "invalid size for user namespace remapping")
} }