validate: add hard and soft limit check for rlimit

Ma Shimiao · wking · commit 3411954bc02f · 2016-10-12T22:52:22.000-07:00
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com> Backported to v1.0.0.rc1 from f175fae #223 (cherry-pick applied cleanly). Signed-off-by: W. Trevor King <wking@tremily.us>
diff --git a/cmd/oci-runtime-tool/validate.go b/cmd/oci-runtime-tool/validate.go
@@ -234,6 +234,9 @@ func checkProcess(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string
 		if !rlimitValid(process.Rlimits[index].Type) {
 			msgs = append(msgs, fmt.Sprintf("rlimit type %q is invalid.", process.Rlimits[index].Type))
 		}
+		if process.Rlimits[index].Hard < process.Rlimits[index].Soft {
+			msgs = append(msgs, fmt.Sprintf("hard limit of rlimit %s should not be less than soft limit.", process.Rlimits[index].Type))
+		}
 	}
 
 	if len(process.ApparmorProfile) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,9 @@ func checkProcess(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string`
`234`	`234`	`if !rlimitValid(process.Rlimits[index].Type) {`
`235`	`235`	`msgs = append(msgs, fmt.Sprintf("rlimit type %q is invalid.", process.Rlimits[index].Type))`
`236`	`236`	`}`
	`237`	`+ if process.Rlimits[index].Hard < process.Rlimits[index].Soft {`
	`238`	`+ msgs = append(msgs, fmt.Sprintf("hard limit of rlimit %s should not be less than soft limit.", process.Rlimits[index].Type))`
	`239`	`+ }`
`237`	`240`	`}`
`238`	`241`
`239`	`242`	`if len(process.ApparmorProfile) > 0 {`