Merge pull request #33284 from mlaventure/17.03.2-cherry-picks

17.03.2 cherry picks
2017-05-19 10:16:24 -04:00 · 2017-05-19 10:16:24 -04:00 · 0ece5c788f
commit 0ece5c788f
parent 69e798217c adbb5b4d39
2 changed files with 3 additions and 1 deletions
--- a/profiles/seccomp/default.json
+++ b/profiles/seccomp/default.json
@ -898,7 +898,8 @@
 			"names": [
 				"settimeofday",
 				"stime",
-				"adjtimex"
+				"adjtimex",
+				"clock_settime"
 			],
 			"action": "SCMP_ACT_ALLOW",
 			"args": [],
--- a/profiles/seccomp/seccomp_default.go
+++ b/profiles/seccomp/seccomp_default.go
@ -733,6 +733,7 @@ func DefaultProfile() *types.Seccomp {
 				"settimeofday",
 				"stime",
 				"adjtimex",
+				"clock_settime",
 			},
 			Action: types.ActAllow,
 			Args:   []*types.Arg{},