@@ -5,6 +5,7 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/container"

+	"github.com/docker/docker/daemon/logger"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/layer"

 	"github.com/docker/docker/pkg/idtools"

@@ -80,6 +81,11 @@ func (daemon *Daemon) create(params types.ContainerCreateConfig) (retC *containe

 		}

 	}()

+	logCfg := container.GetLogConfig(daemon.defaultLogConfig)

+	if err := logger.ValidateLogOpts(logCfg.Type, logCfg.Config); err != nil {

+		return nil, err

+	}

+

 	if err := daemon.setSecurityOptions(container, params.HostConfig); err != nil {

 		return nil, err

 	}

@@ -440,3 +440,11 @@ func (s *DockerSuite) TestCreateWithWorkdir(c *check.C) {

 	dockerCmd(c, "create", "--name", name, "-w", dir, "busybox")

 	dockerCmd(c, "cp", fmt.Sprintf("%s:%s", name, dir), prefix+slash+"tmp")

 }

+

+func (s *DockerSuite) TestCreateWithInvalidLogOpts(c *check.C) {

+	name := "test-invalidate-log-opts"

+	_, _, err := dockerCmdWithError("create", "--name", name, "--log-opt", "invalid=true")

+	c.Assert(err, checker.NotNil)

+	out, _ := dockerCmd(c, "ps", "-a")

+	c.Assert(out, checker.Not(checker.Contains), name)

+}