bump opencontainers/selinux to v1.2
authorSebastiaan van Stijn <github@gone.nl>
Thu, 21 Mar 2019 08:58:13 +0000 (09:58 +0100)
committerDmitry Smirnov <onlyjob@debian.org>
Tue, 8 Oct 2019 03:37:25 +0000 (04:37 +0100)
Gbp-Pq: Name selinux-docker.patch

engine/daemon/create.go

index 1afb1bebea328468711fe2127da3bb49a4713590..755223c97b3edb9a9919ec06c6672e8079ec2a6e 100644 (file)
@@ -226,7 +226,10 @@ func (daemon *Daemon) generateSecurityOpt(hostConfig *containertypes.HostConfig)
                if err != nil {
                        return nil, err
                }
-               ipcLabel = label.DupSecOpt(c.ProcessLabel)
+               ipcLabel, err = label.DupSecOpt(c.ProcessLabel)
+               if err != nil {
+                       return nil, err
+               }
                if pidContainer == "" {
                        return toHostConfigSelinuxLabels(ipcLabel), err
                }
@@ -237,7 +240,10 @@ func (daemon *Daemon) generateSecurityOpt(hostConfig *containertypes.HostConfig)
                        return nil, err
                }
 
-               pidLabel = label.DupSecOpt(c.ProcessLabel)
+               pidLabel, err = label.DupSecOpt(c.ProcessLabel)
+               if err != nil {
+                       return nil, err
+               }
                if ipcContainer == "" {
                        return toHostConfigSelinuxLabels(pidLabel), err
                }