From bd40bbc30b831c9d421e211b5f3276896f899699 Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Fri, 16 Jun 2017 15:49:16 -0700 Subject: [PATCH] Add missing error checks and simplify bool check Signed-off-by: Mrunal Patel --- cmd/crio/main.go | 2 +- server/container_create.go | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/crio/main.go b/cmd/crio/main.go index 7def0e53..6f0930d7 100644 --- a/cmd/crio/main.go +++ b/cmd/crio/main.go @@ -290,7 +290,7 @@ func main() { if err != nil { return fmt.Errorf("invalid --cpu-profile value %q", err) } - pprof.StartCPUProfile(f) + _ = pprof.StartCPUProfile(f) defer pprof.StopCPUProfile() } diff --git a/server/container_create.go b/server/container_create.go index c7ee28b8..99c7f814 100644 --- a/server/container_create.go +++ b/server/container_create.go @@ -49,7 +49,9 @@ func addOCIBindMounts(sb *sandbox, containerConfig *pb.ContainerConfig, specgen } if _, err := os.Stat(src); err != nil && os.IsNotExist(err) { - os.MkdirAll(src, 0644) + if err1 := os.MkdirAll(src, 0644); err1 != nil { + return fmt.Errorf("Failed to mkdir %s: %s", src, err) + } } options := []string{"rw"} @@ -455,7 +457,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string, specgen.SetLinuxMountLabel(sb.mountLabel) if containerConfig.GetLinux().GetSecurityContext() != nil && - containerConfig.GetLinux().GetSecurityContext().Privileged == false { + !containerConfig.GetLinux().GetSecurityContext().Privileged { for _, mp := range []string{ "/proc/kcore", "/proc/latency_stats", @@ -605,7 +607,9 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string, if err != nil { return nil, err } - os.MkdirAll(fp, 0644) + if err1 := os.MkdirAll(fp, 0644); err1 != nil { + return nil, err1 + } } processArgs, err := buildOCIProcessArgs(containerConfig, containerImageConfig)