kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701

Browse source 
Handle error from GetDevice early
This commit is contained in:
Michael Crosby 2014-08-26 10:53:40 -07:00
commit 89f64712fa
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/container.go
View file

@ -230,10 +230,10 @@ func populateCommand(c *Container, env []string) error {
userSpecifiedDevices := make([]*devices.Device, len(c.hostConfig.Devices)) userSpecifiedDevices := make([]*devices.Device, len(c.hostConfig.Devices))
for i, deviceMapping := range c.hostConfig.Devices { for i, deviceMapping := range c.hostConfig.Devices {
device, err := devices.GetDevice(deviceMapping.PathOnHost, deviceMapping.CgroupPermissions) device, err := devices.GetDevice(deviceMapping.PathOnHost, deviceMapping.CgroupPermissions)
device.Path = deviceMapping.PathInContainer
if err != nil { if err != nil {
return fmt.Errorf("error gathering device information while adding custom device %s", err) return fmt.Errorf("error gathering device information while adding custom device %q: %s", deviceMapping.PathOnHost, err)
} }
device.Path = deviceMapping.PathInContainer
userSpecifiedDevices[i] = device userSpecifiedDevices[i] = device
} }
allowedDevices := append(devices.DefaultAllowedDevices, userSpecifiedDevices...) allowedDevices := append(devices.DefaultAllowedDevices, userSpecifiedDevices...)

14
integration-cli/docker_cli_run_test.go
View file

@ -1630,3 +1630,17 @@ func TestWriteResolvFileAndNotCommit(t *testing.T) {
logDone("run - write to /etc/resolv.conf and not commited") logDone("run - write to /etc/resolv.conf and not commited")
} }
func TestRunWithBadDevice(t *testing.T) {
name := "baddevice"
cmd := exec.Command(dockerBinary, "run", "--name", name, "--device", "/etc", "busybox", "true")
out, _, err := runCommandWithOutput(cmd)
if err == nil {
t.Fatal("Run should fail with bad device")
}
expected := `"/etc": not a device node`
if !strings.Contains(out, expected) {
t.Fatalf("Output should contain %q, actual out: %q", expected, out)
}
logDone("run - error with bad device")
}