prog: rework address allocation

1. mmap all memory always, without explicit mmap calls in the program.
This makes lots of things much easier and removes lots of code.
Makes mmap not a special syscall and allows to fuzz without mmap enabled.

2. Change address assignment algorithm.
Current algorithm allocates unmapped addresses too frequently
and allows collisions between arguments of a single syscall.
The new algorithm analyzes actual allocations in the program
and places new arguments at unused locations.

2 files changed, 6 insertions, 39 deletions

diff --git a/sys/netbsd/amd64.go b/sys/netbsd/amd64.go
index 66abbe3cc..cff461cd4 100644
--- a/sys/netbsd/amd64.go
+++ b/sys/netbsd/amd64.go
@@ -4,7 +4,7 @@ package netbsd
 import . "github.com/google/syzkaller/prog"
 
 func init() {
-	RegisterTarget(&Target{OS: "netbsd", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, initTarget)
+	RegisterTarget(&Target{OS: "netbsd", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, initTarget)
 }
 
 var resources_amd64 = []*ResourceDesc{
@@ -1674,4 +1674,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "WUNTRACED", Value: 2},
 }
 
-const revision_amd64 = "8a10b163677425b6f340b2e4e277358c7c1a4237"
+const revision_amd64 = "350c03f12de803ca8775df640249eae7e2425419"
diff --git a/sys/netbsd/init.go b/sys/netbsd/init.go
index f44753e82..3af3619b6 100644
--- a/sys/netbsd/init.go
+++ b/sys/netbsd/init.go
@@ -17,18 +17,12 @@ func initTarget(target *prog.Target) {
 		MAP_FIXED:     target.ConstMap["MAP_FIXED"],
 	}
 
-	target.PageSize = pageSize
-	target.DataOffset = dataOffset
-	target.MmapSyscall = arch.mmapSyscall
 	target.MakeMmap = arch.makeMmap
-	target.AnalyzeMmap = arch.analyzeMmap
 	target.SanitizeCall = arch.sanitizeCall
 }
 
 const (
-	pageSize   = 4 << 10
-	dataOffset = 512 << 20
-	invalidFD  = ^uint64(0)
+	invalidFD = ^uint64(0)
 )
 
 type arch struct {
@@ -42,14 +36,13 @@ type arch struct {
 	MAP_FIXED     uint64
 }
 
-// createMmapCall creates a "normal" mmap call that maps [start, start+npages) page range.
-func (arch *arch) makeMmap(start, npages uint64) *prog.Call {
+func (arch *arch) makeMmap(addr, size uint64) *prog.Call {
 	meta := arch.mmapSyscall
 	return &prog.Call{
 		Meta: meta,
 		Args: []prog.Arg{
-			prog.MakePointerArg(meta.Args[0], start, 0, npages, nil),
-			prog.MakeConstArg(meta.Args[1], npages*pageSize),
+			prog.MakeVmaPointerArg(meta.Args[0], addr, size),
+			prog.MakeConstArg(meta.Args[1], size),
 			prog.MakeConstArg(meta.Args[2], arch.PROT_READ|arch.PROT_WRITE),
 			prog.MakeConstArg(meta.Args[3], arch.MAP_ANONYMOUS|arch.MAP_PRIVATE|arch.MAP_FIXED),
 			prog.MakeResultArg(meta.Args[4], nil, invalidFD),
@@ -60,32 +53,6 @@ func (arch *arch) makeMmap(start, npages uint64) *prog.Call {
 	}
 }
 
-func (arch *arch) analyzeMmap(c *prog.Call) (start, npages uint64, mapped bool) {
-	switch c.Meta.Name {
-	case "mmap":
-		// Filter out only very wrong arguments.
-		npages = c.Args[1].(*prog.ConstArg).Val / pageSize
-		if npages == 0 {
-			return
-		}
-		flags := c.Args[3].(*prog.ConstArg).Val
-		fd := c.Args[4].(*prog.ResultArg).Val
-		if flags&arch.MAP_ANONYMOUS == 0 && fd == invalidFD {
-			return
-		}
-		start = c.Args[0].(*prog.PointerArg).PageIndex
-		mapped = true
-		return
-	case "munmap":
-		start = c.Args[0].(*prog.PointerArg).PageIndex
-		npages = c.Args[1].(*prog.ConstArg).Val / pageSize
-		mapped = false
-		return
-	default:
-		return
-	}
-}
-
 func (arch *arch) sanitizeCall(c *prog.Call) {
 	switch c.Meta.CallName {
 	case "mmap":