mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2398 from pkagrawal/master

Browse Source 
Honor spec.Process.NoNewPrivileges in specconv.CreateLibcontainerConfig
This commit is contained in:
Akihiro Suda
2020-05-12 15:05:55 +09:00
committed by GitHub
parent 867c9f5bc4 4aa9101477
commit 2b9a36ee8c
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/specconv/spec_linux.go
+1
View File
@@ -260,6 +260,7 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
}
if spec.Process != nil {
config.OomScoreAdj = spec.Process.OOMScoreAdj
config.NoNewPrivileges = spec.Process.NoNewPrivileges
if spec.Process.SelinuxLabel != "" {
config.ProcessLabel = spec.Process.SelinuxLabel
}
libcontainer/specconv/spec_linux_test.go
+5
View File
@@ -391,6 +391,11 @@ func TestSpecconvExampleValidate(t *testing.T) {
t.Errorf("Couldn't create libcontainer config: %v", err)
}
if config.NoNewPrivileges != spec.Process.NoNewPrivileges {
t.Errorf("specconv NoNewPrivileges mismatch. Expected %v got %v",
spec.Process.NoNewPrivileges, config.NoNewPrivileges)
}
validator := validate.New()
if err := validator.Validate(config); err != nil {
t.Errorf("Expected specconv to produce valid container config: %v", err)