beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gocapability: upstream fix for unsporrted caps

Browse source 
@vmarmol has made the fix upstream for not failing if the capability
being dropped is returned as invalid from the syscall, which is the case
when the capability is not supported on the host.
This is a blocker presently for RHEL6.5 on CAP_SYSLOG. We have patched
around this in our RPM for the time being, but this is the proper fix.

See also https://github.com/dotcloud/docker/pull/5810

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
This commit is contained in:
Vincent Batts 2014-05-17 03:51:02 -04:00
parent 17a1f470ae
commit 4bf03a0fac
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/vendor.sh
View file

@ -45,7 +45,7 @@ clone git github.com/gorilla/context 708054d61e5
clone git github.com/gorilla/mux 9b36453141c
clone git github.com/syndtr/gocapability 3454319be2
clone git github.com/syndtr/gocapability 3c85049eae
clone hg code.google.com/p/go.net 84a4013f96e0

5
vendor/src/github.com/syndtr/gocapability/capability/capability_linux.go vendored
View file

@ -388,6 +388,11 @@ func (c *capsV3) Apply(kind CapType) (err error) {
}
err = prctl(syscall.PR_CAPBSET_DROP, uintptr(i), 0, 0, 0)
if err != nil {
// Ignore EINVAL since the capability may not be supported in this system.
if errno, ok := err.(syscall.Errno); ok && errno == syscall.EINVAL {
err = nil
continue
}
return
}
}