Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix nil deference #494

Merged
merged 2 commits into from
Oct 17, 2017
Merged

fix nil deference #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d2dbbc
runtimetest: fix nil deference
Oct 11, 2017
19b061c
generate: fix nil deference
Oct 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 34 additions & 16 deletions cmd/runtimetest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ func validateGeneralProcess(spec *rspec.Spec) error {
}

func validateLinuxProcess(spec *rspec.Spec) error {
if spec.Process == nil {
return nil
}

validateGeneralProcess(spec)

uid := os.Getuid()
Expand Down Expand Up @@ -162,6 +166,10 @@ func validateLinuxProcess(spec *rspec.Spec) error {
}

func validateCapabilities(spec *rspec.Spec) error {
if spec.Process == nil || spec.Process.Capabilities == nil {
return nil
}

last := capability.CAP_LAST_CAP
// workaround for RHEL6 which has no /proc/sys/kernel/cap_last_cap
if last == capability.Cap(63) {
Expand All @@ -178,22 +186,20 @@ func validateCapabilities(spec *rspec.Spec) error {
expectedCaps3 := make(map[string]bool)
expectedCaps4 := make(map[string]bool)
expectedCaps5 := make(map[string]bool)
if spec.Process.Capabilities != nil {
for _, ec := range spec.Process.Capabilities.Bounding {
expectedCaps1[ec] = true
}
for _, ec := range spec.Process.Capabilities.Effective {
expectedCaps2[ec] = true
}
for _, ec := range spec.Process.Capabilities.Inheritable {
expectedCaps3[ec] = true
}
for _, ec := range spec.Process.Capabilities.Permitted {
expectedCaps4[ec] = true
}
for _, ec := range spec.Process.Capabilities.Ambient {
expectedCaps5[ec] = true
}
for _, ec := range spec.Process.Capabilities.Bounding {
expectedCaps1[ec] = true
}
for _, ec := range spec.Process.Capabilities.Effective {
expectedCaps2[ec] = true
}
for _, ec := range spec.Process.Capabilities.Inheritable {
expectedCaps3[ec] = true
}
for _, ec := range spec.Process.Capabilities.Permitted {
expectedCaps4[ec] = true
}
for _, ec := range spec.Process.Capabilities.Ambient {
expectedCaps5[ec] = true
}

for _, cap := range capability.List() {
Expand Down Expand Up @@ -259,6 +265,10 @@ func validateHostname(spec *rspec.Spec) error {
}

func validateRlimits(spec *rspec.Spec) error {
if spec.Process == nil {
return nil
}

for _, r := range spec.Process.Rlimits {
rl, err := strToRlimit(r.Type)
if err != nil {
Expand Down Expand Up @@ -311,6 +321,10 @@ func testWriteAccess(path string) error {
}

func validateRootFS(spec *rspec.Spec) error {
if spec.Root == nil {
return nil
}

if spec.Root.Readonly {
err := testWriteAccess("/")
if err == nil {
Expand Down Expand Up @@ -422,6 +436,10 @@ func validateDefaultSymlinks(spec *rspec.Spec) error {
}

func validateDefaultDevices(spec *rspec.Spec) error {
if spec.Process == nil {
return nil
}

if spec.Process.Terminal {
defaultDevices = append(defaultDevices, "/dev/console")
}
Expand Down
25 changes: 8 additions & 17 deletions generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ func (g *Generator) SetProcessArgs(args []string) {

// ClearProcessEnv clears g.spec.Process.Env.
func (g *Generator) ClearProcessEnv() {
if g.spec == nil {
if g.spec == nil || g.spec.Process == nil {
return
}
g.spec.Process.Env = []string{}
Expand Down Expand Up @@ -440,7 +440,7 @@ func (g *Generator) AddProcessRlimits(rType string, rHard uint64, rSoft uint64)

// RemoveProcessRlimits removes a rlimit from g.spec.Process.Rlimits.
func (g *Generator) RemoveProcessRlimits(rType string) error {
if g.spec == nil {
if g.spec == nil || g.spec.Process == nil {
return nil
}
for i, rlimit := range g.spec.Process.Rlimits {
Expand All @@ -454,15 +454,15 @@ func (g *Generator) RemoveProcessRlimits(rType string) error {

// ClearProcessRlimits clear g.spec.Process.Rlimits.
func (g *Generator) ClearProcessRlimits() {
if g.spec == nil {
if g.spec == nil || g.spec.Process == nil {
return
}
g.spec.Process.Rlimits = []rspec.POSIXRlimit{}
}

// ClearProcessAdditionalGids clear g.spec.Process.AdditionalGids.
func (g *Generator) ClearProcessAdditionalGids() {
if g.spec == nil {
if g.spec == nil || g.spec.Process == nil {
return
}
g.spec.Process.User.AdditionalGids = []uint32{}
Expand Down Expand Up @@ -737,10 +737,7 @@ func (g *Generator) SetLinuxRootPropagation(rp string) error {

// ClearPreStartHooks clear g.spec.Hooks.Prestart.
func (g *Generator) ClearPreStartHooks() {
if g.spec == nil {
return
}
if g.spec.Hooks == nil {
if g.spec == nil || g.spec.Hooks == nil {
return
}
g.spec.Hooks.Prestart = []rspec.Hook{}
Expand Down Expand Up @@ -787,10 +784,7 @@ func (g *Generator) AddPreStartHookTimeout(path string, timeout int) {

// ClearPostStopHooks clear g.spec.Hooks.Poststop.
func (g *Generator) ClearPostStopHooks() {
if g.spec == nil {
return
}
if g.spec.Hooks == nil {
if g.spec == nil || g.spec.Hooks == nil {
return
}
g.spec.Hooks.Poststop = []rspec.Hook{}
Expand Down Expand Up @@ -837,10 +831,7 @@ func (g *Generator) AddPostStopHookTimeout(path string, timeout int) {

// ClearPostStartHooks clear g.spec.Hooks.Poststart.
func (g *Generator) ClearPostStartHooks() {
if g.spec == nil {
return
}
if g.spec.Hooks == nil {
if g.spec == nil || g.spec.Hooks == nil {
return
}
g.spec.Hooks.Poststart = []rspec.Hook{}
Expand Down Expand Up @@ -976,7 +967,7 @@ func (g *Generator) SetupPrivileged(privileged bool) {

// ClearProcessCapabilities clear g.spec.Process.Capabilities.
func (g *Generator) ClearProcessCapabilities() {
if g.spec == nil {
if g.spec == nil || g.spec.Process == nil || g.spec.Process.Capabilities == nil {
return
}
g.spec.Process.Capabilities.Bounding = []string{}
Expand Down