opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-26 10:45:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Lint: Do not ignore errors from docker run command when selinux enabled

Browse Source 
Redefining err by := operator within block makes this err variable block local.

Addressing lint:
libpod/oci.go:368:3⚠️ ineffectual assignment to err (ineffassign)

Signed-off-by: Šimon Lukašík <slukasik@redhat.com>
This commit is contained in:
Šimon Lukašík
2018-11-09 10:23:24 +01:00
parent 9497b2254c
commit 223d102ec7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/oci.go
View File

@ -350,7 +350,8 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res
// Set the label of the conmon process to be level :s0 // Set the label of the conmon process to be level :s0
// This will allow the container processes to talk to fifo-files // This will allow the container processes to talk to fifo-files
// passed into the container by conmon // passed into the container by conmon
plabel, err := selinux.CurrentLabel() var plabel string
plabel, err = selinux.CurrentLabel()
if err != nil { if err != nil {
childPipe.Close() childPipe.Close()
return errors.Wrapf(err, "Failed to get current SELinux label") return errors.Wrapf(err, "Failed to get current SELinux label")
@ -360,7 +361,7 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res
runtime.LockOSThread() runtime.LockOSThread()
if c["level"] != "s0" && c["level"] != "" { if c["level"] != "s0" && c["level"] != "" {
c["level"] = "s0" c["level"] = "s0"
if err := label.SetProcessLabel(c.Get()); err != nil { if err = label.SetProcessLabel(c.Get()); err != nil {
runtime.UnlockOSThread() runtime.UnlockOSThread()
return err return err
} }