From 442206d76b974cca2d83ec763d4cf5ee829eb7d6 Mon Sep 17 00:00:00 2001
From: Anton Lindqvist <anton@basename.se>
Date: Fri, 14 Jun 2019 17:59:10 +0200
Subject: sys/openbsd: sanitize mlockall syscalls

Locking down future mappings will most likely cause syz-executor to run
out of memory.

This is one of the root causes of the high amount of reported "lost
connection to test machine".
---
 sys/openbsd/init.go      | 6 ++++++
 sys/openbsd/init_test.go | 5 +++++
 2 files changed, 11 insertions(+)

(limited to 'sys')

diff --git a/sys/openbsd/init.go b/sys/openbsd/init.go
index 8d5e8b0dd..01450ee3c 100644
--- a/sys/openbsd/init.go
+++ b/sys/openbsd/init.go
@@ -42,6 +42,9 @@ const (
 	// kOutPipeFd in executor/executor.cc
 	kcovFdMinorMax = 248
 
+	// MCL_FUTURE from openbsd:src/sys/sys/mman.h
+	mclFuture uint64 = 0x2
+
 	// RLIMIT_DATA from openbsd:src/sys/sys/resource.h
 	rlimitData = 2
 	// RLIMIT_STACK from openbsd:src/sys/sys/resource.h
@@ -112,6 +115,9 @@ func (arch *arch) SanitizeCall(c *prog.Call) {
 		if devmajor(dev.Val) == 4 && devminor(dev.Val) == 2 {
 			dev.Val = devNullDevT
 		}
+	case "mlockall":
+		flags := c.Args[0].(*prog.ConstArg)
+		flags.Val &= ^mclFuture
 	case "setrlimit":
 		var rlimitMin uint64
 		var rlimitMax uint64 = math.MaxUint64
diff --git a/sys/openbsd/init_test.go b/sys/openbsd/init_test.go
index 7d2fdc021..d2a0845f0 100644
--- a/sys/openbsd/init_test.go
+++ b/sys/openbsd/init_test.go
@@ -46,6 +46,11 @@ func TestSanitizeCall(t *testing.T) {
 			`mknod(0x0, 0x0, 0x0402)`,
 			`mknod(0x0, 0x0, 0x202)`,
 		},
+		{
+			// MCL_CURRENT | MCL_FUTURE
+			`mlockall(0x3)`,
+			`mlockall(0x1)`,
+		},
 		{
 			// RLIMIT_DATA
 			`setrlimit(0x2, &(0x7f0000cc0ff0)={0x0, 0x80000000})`,
-- 
cgit mrf-deployment