@@ -6,16 +6,15 @@ import (
66 "sort"
77 "strings"
88
9+ "github.com/kolyshkin/capability"
910 "github.com/opencontainers/runc/libcontainer/configs"
1011 "github.com/sirupsen/logrus"
11- "github.com/syndtr/gocapability/capability"
1212)
1313
1414const allCapabilityTypes = capability .CAPS | capability .BOUNDING | capability .AMBIENT
1515
1616var (
17- capabilityMap map [string ]capability.Cap
18- capTypes = []capability.CapType {
17+ capTypes = []capability.CapType {
1918 capability .BOUNDING ,
2019 capability .PERMITTED ,
2120 capability .INHERITABLE ,
@@ -24,14 +23,19 @@ var (
2423 }
2524)
2625
27- func init () {
28- capabilityMap = make (map [string ]capability.Cap , capability .CAP_LAST_CAP + 1 )
26+ func getCapMap () (map [string ]capability.Cap , error ) {
27+ lastcap , err := capability .LastCap ()
28+ if err != nil {
29+ return nil , err
30+ }
31+ capabilityMap := make (map [string ]capability.Cap , lastcap + 1 )
2932 for _ , c := range capability .List () {
30- if c > capability . CAP_LAST_CAP {
33+ if c > lastcap {
3134 continue
3235 }
3336 capabilityMap ["CAP_" + strings .ToUpper (c .String ())] = c
3437 }
38+ return capabilityMap , nil
3539}
3640
3741// KnownCapabilities returns the list of the known capabilities.
@@ -53,14 +57,17 @@ func New(capConfig *configs.Capabilities) (*Caps, error) {
5357 err error
5458 c Caps
5559 )
56-
60+ cmap , err := getCapMap ()
61+ if err != nil {
62+ return nil , err
63+ }
5764 unknownCaps := make (map [string ]struct {})
5865 c .caps = map [capability.CapType ][]capability.Cap {
59- capability .BOUNDING : capSlice (capConfig .Bounding , unknownCaps ),
60- capability .EFFECTIVE : capSlice (capConfig .Effective , unknownCaps ),
61- capability .INHERITABLE : capSlice (capConfig .Inheritable , unknownCaps ),
62- capability .PERMITTED : capSlice (capConfig .Permitted , unknownCaps ),
63- capability .AMBIENT : capSlice (capConfig .Ambient , unknownCaps ),
66+ capability .BOUNDING : capSlice (capConfig .Bounding , cmap , unknownCaps ),
67+ capability .EFFECTIVE : capSlice (capConfig .Effective , cmap , unknownCaps ),
68+ capability .INHERITABLE : capSlice (capConfig .Inheritable , cmap , unknownCaps ),
69+ capability .PERMITTED : capSlice (capConfig .Permitted , cmap , unknownCaps ),
70+ capability .AMBIENT : capSlice (capConfig .Ambient , cmap , unknownCaps ),
6471 }
6572 if c .pid , err = capability .NewPid2 (0 ); err != nil {
6673 return nil , err
@@ -77,10 +84,10 @@ func New(capConfig *configs.Capabilities) (*Caps, error) {
7784// capSlice converts the slice of capability names in caps, to their numeric
7885// equivalent, and returns them as a slice. Unknown or unavailable capabilities
7986// are not returned, but appended to unknownCaps.
80- func capSlice (caps []string , unknownCaps map [string ]struct {}) []capability.Cap {
87+ func capSlice (caps []string , cmap map [ string ]capability. Cap , unknownCaps map [string ]struct {}) []capability.Cap {
8188 var out []capability.Cap
8289 for _ , c := range caps {
83- if v , ok := capabilityMap [c ]; ! ok {
90+ if v , ok := cmap [c ]; ! ok {
8491 unknownCaps [c ] = struct {}{}
8592 } else {
8693 out = append (out , v )
0 commit comments