From 8097da31fb14c0b0d0aa03fb5b6b392339d6da6c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 21 Mar 2019 09:58:13 +0100 Subject: [PATCH] bump opencontainers/selinux to v1.2 Gbp-Pq: Name selinux-docker.patch --- engine/daemon/create.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/engine/daemon/create.go b/engine/daemon/create.go index 1afb1beb..755223c9 100644 --- a/engine/daemon/create.go +++ b/engine/daemon/create.go @@ -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 } -- 2.30.2