summaryrefslogtreecommitdiffhomepage
path: root/runsc
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-04-10 22:51:39 +0000
committergVisor bot <gvisor-bot@google.com>2020-04-10 22:51:39 +0000
commit43c49fc5896f022b207b07da85f904cedd14d57e (patch)
tree06fcf258cb5055a0307f55dfbbb5e04981386223 /runsc
parent662290db1f03ee2a8a9c23b8922406b1f5731ecb (diff)
parent96f914295920404e7c5c97553771e09b31f6900a (diff)
Merge release-20200323.0-128-g96f9142 (automated)
Diffstat (limited to 'runsc')
-rw-r--r--runsc/boot/filter/config.go2
-rw-r--r--runsc/main.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/runsc/boot/filter/config.go b/runsc/boot/filter/config.go
index 06b9f888a..1828d116a 100644
--- a/runsc/boot/filter/config.go
+++ b/runsc/boot/filter/config.go
@@ -44,7 +44,7 @@ var allowedSyscalls = seccomp.SyscallRules{
{
seccomp.AllowAny{},
seccomp.AllowAny{},
- seccomp.AllowValue(0),
+ seccomp.AllowValue(syscall.O_CLOEXEC),
},
},
syscall.SYS_EPOLL_CREATE1: {},
diff --git a/runsc/main.go b/runsc/main.go
index c1c78529c..59f624842 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -291,7 +291,7 @@ func main() {
// want with them. Since Docker and Containerd both eat boot's stderr, we
// dup our stderr to the provided log FD so that panics will appear in the
// logs, rather than just disappear.
- if err := syscall.Dup3(fd, int(os.Stderr.Fd()), 0); err != nil {
+ if err := syscall.Dup3(fd, int(os.Stderr.Fd()), syscall.O_CLOEXEC); err != nil {
cmd.Fatalf("error dup'ing fd %d to stderr: %v", fd, err)
}
}