commit 0ece5c788f232d2e8c7d5889f820e693ba70a68b
author Brian Goff <cpuguy83@gmail.com> Fri May 19 10:16:24 2017 -0400
committer GitHub <noreply@github.com> Fri May 19 10:16:24 2017 -0400
tree 3a722b287ea2ca017352ac31005021f618453a8f
parent 69e798217ccbaafd073fcaa64a02c81875caf3f9
parent adbb5b4d39909abdc8791fa5b5414deff938770f

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

17.03.2 cherry picks

profiles/seccomp/default.json

diff --git a/profiles/seccomp/default.json b/profiles/seccomp/default.json
index 932aa55..006592f 100755
--- 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": [],

profiles/seccomp/seccomp_default.go

diff --git a/profiles/seccomp/seccomp_default.go b/profiles/seccomp/seccomp_default.go
index dee189a..e3943f8 100644
--- a/profiles/seccomp/seccomp_default.go
+++ b/profiles/seccomp/seccomp_default.go
@@ -733,6 +733,7 @@
 				"settimeofday",
 				"stime",
 				"adjtimex",
+				"clock_settime",
 			},
 			Action: types.ActAllow,
 			Args:   []*types.Arg{},