aboutsummaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/akaros/init.go4
-rw-r--r--sys/freebsd/init.go6
-rw-r--r--sys/linux/init.go18
-rw-r--r--sys/linux/init_iptables.go2
-rw-r--r--sys/linux/init_test.go2
-rw-r--r--sys/netbsd/init.go6
-rw-r--r--sys/openbsd/init.go10
-rw-r--r--sys/openbsd/init_test.go2
-rw-r--r--sys/targets/common.go8
-rw-r--r--sys/trusty/init.go8
10 files changed, 29 insertions, 37 deletions
diff --git a/sys/akaros/init.go b/sys/akaros/init.go
index ede55dfe9..5458f1462 100644
--- a/sys/akaros/init.go
+++ b/sys/akaros/init.go
@@ -17,10 +17,10 @@ func InitTarget(target *prog.Target) {
MAP_FIXED: target.GetConst("MAP_FIXED"),
}
target.MakeMmap = targets.MakePosixMmap(target)
- target.SanitizeCall = arch.sanitizeCall
+ target.Neutralize = arch.Neutralize
}
-func (arch *arch) sanitizeCall(c *prog.Call) {
+func (arch *arch) Neutralize(c *prog.Call) {
switch c.Meta.CallName {
case "mmap":
c.Args[3].(*prog.ConstArg).Val |= arch.MAP_FIXED
diff --git a/sys/freebsd/init.go b/sys/freebsd/init.go
index ab2224715..ecb976f91 100644
--- a/sys/freebsd/init.go
+++ b/sys/freebsd/init.go
@@ -10,13 +10,13 @@ import (
func InitTarget(target *prog.Target) {
arch := &arch{
- unix: targets.MakeUnixSanitizer(target),
+ unix: targets.MakeUnixNeutralizer(target),
}
target.MakeMmap = targets.MakePosixMmap(target)
- target.SanitizeCall = arch.unix.SanitizeCall
+ target.Neutralize = arch.unix.Neutralize
}
type arch struct {
- unix *targets.UnixSanitizer
+ unix *targets.UnixNeutralizer
}
diff --git a/sys/linux/init.go b/sys/linux/init.go
index cf54ffcd0..e1474995b 100644
--- a/sys/linux/init.go
+++ b/sys/linux/init.go
@@ -12,7 +12,7 @@ import (
func InitTarget(target *prog.Target) {
arch := &arch{
- unix: targets.MakeUnixSanitizer(target),
+ unix: targets.MakeUnixNeutralizer(target),
clockGettimeSyscall: target.SyscallMap["clock_gettime"],
MREMAP_MAYMOVE: target.GetConst("MREMAP_MAYMOVE"),
MREMAP_FIXED: target.GetConst("MREMAP_FIXED"),
@@ -49,7 +49,7 @@ func InitTarget(target *prog.Target) {
}
target.MakeMmap = targets.MakePosixMmap(target)
- target.SanitizeCall = arch.sanitizeCall
+ target.Neutralize = arch.neutralize
target.SpecialTypes = map[string]func(g *prog.Gen, typ prog.Type, old prog.Arg) (
prog.Arg, []*prog.Call){
"timespec": arch.generateTimespec,
@@ -118,7 +118,7 @@ var (
)
type arch struct {
- unix *targets.UnixSanitizer
+ unix *targets.UnixNeutralizer
clockGettimeSyscall *prog.Syscall
@@ -155,8 +155,8 @@ type arch struct {
TIOCGSERIAL uint64
}
-func (arch *arch) sanitizeCall(c *prog.Call) {
- arch.unix.SanitizeCall(c)
+func (arch *arch) neutralize(c *prog.Call) {
+ arch.unix.Neutralize(c)
switch c.Meta.CallName {
case "mremap":
// Add MREMAP_FIXED flag, otherwise it produces non-deterministic results.
@@ -175,7 +175,7 @@ func (arch *arch) sanitizeCall(c *prog.Call) {
cmd.Val = arch.SYSLOG_ACTION_SIZE_UNREAD
}
case "ioctl":
- arch.sanitizeIoctl(c)
+ arch.neutralizeIoctl(c)
case "fanotify_mark":
// FAN_*_PERM require the program to reply to open requests.
// If that does not happen, the program will hang in an unkillable state forever.
@@ -222,7 +222,7 @@ func (arch *arch) sanitizeCall(c *prog.Call) {
switch c.Meta.Name {
case "setsockopt$EBT_SO_SET_ENTRIES":
- arch.sanitizeEbtables(c)
+ arch.neutralizeEbtables(c)
}
}
@@ -241,7 +241,7 @@ func enforceIntArg(a prog.Arg) {
}
}
-func (arch *arch) sanitizeIoctl(c *prog.Call) {
+func (arch *arch) neutralizeIoctl(c *prog.Call) {
cmd := c.Args[1].(*prog.ConstArg)
switch uint64(uint32(cmd.Val)) {
case arch.FIFREEZE:
@@ -270,7 +270,7 @@ func (arch *arch) sanitizeIoctl(c *prog.Call) {
// https://groups.google.com/g/syzkaller-bugs/c/1rVENJf9P4U/m/QtGpapRxAgAJ
// https://syzkaller.appspot.com/bug?extid=f4f1e871965064ae689e
// TODO: TIOCSSERIAL does some other things that are not dangerous
- // and would be nice to test, if/when we can sanitize based on sandbox value
+ // and would be nice to test, if/when we can neutralize based on sandbox value
// we could prohibit it only under sandbox=none.
cmd.Val = arch.TIOCGSERIAL
}
diff --git a/sys/linux/init_iptables.go b/sys/linux/init_iptables.go
index 2a49bffe4..a1adf3fb0 100644
--- a/sys/linux/init_iptables.go
+++ b/sys/linux/init_iptables.go
@@ -164,7 +164,7 @@ func (arch *arch) generateEbtables(g *prog.Gen, typ prog.Type, old prog.Arg) (
return
}
-func (arch *arch) sanitizeEbtables(c *prog.Call) {
+func (arch *arch) neutralizeEbtables(c *prog.Call) {
// This is very hacky... just as netfilter interfaces.
// setsockopt's len argument must be equal to size of ebt_replace + entries size.
lenArg := c.Args[4].(*prog.ConstArg)
diff --git a/sys/linux/init_test.go b/sys/linux/init_test.go
index ae1a49698..fb3068295 100644
--- a/sys/linux/init_test.go
+++ b/sys/linux/init_test.go
@@ -10,7 +10,7 @@ import (
_ "github.com/google/syzkaller/sys/linux/gen"
)
-func TestSanitize(t *testing.T) {
+func TestNeutralize(t *testing.T) {
prog.TestDeserializeHelper(t, "linux", "amd64", nil, []prog.DeserializeTest{
{
In: `syslog(0x10000000006, 0x0, 0x0)`,
diff --git a/sys/netbsd/init.go b/sys/netbsd/init.go
index c039f4d43..6591e67b7 100644
--- a/sys/netbsd/init.go
+++ b/sys/netbsd/init.go
@@ -10,13 +10,13 @@ import (
func InitTarget(target *prog.Target) {
arch := &arch{
- unix: targets.MakeUnixSanitizer(target),
+ unix: targets.MakeUnixNeutralizer(target),
}
target.MakeMmap = targets.MakePosixMmap(target)
- target.SanitizeCall = arch.unix.SanitizeCall
+ target.Neutralize = arch.unix.Neutralize
}
type arch struct {
- unix *targets.UnixSanitizer
+ unix *targets.UnixNeutralizer
}
diff --git a/sys/openbsd/init.go b/sys/openbsd/init.go
index e7c5d08f6..e27ba8d60 100644
--- a/sys/openbsd/init.go
+++ b/sys/openbsd/init.go
@@ -13,19 +13,19 @@ import (
func InitTarget(target *prog.Target) {
arch := &arch{
- unix: targets.MakeUnixSanitizer(target),
+ unix: targets.MakeUnixNeutralizer(target),
DIOCKILLSTATES: target.GetConst("DIOCKILLSTATES"),
S_IFMT: target.GetConst("S_IFMT"),
S_IFCHR: target.GetConst("S_IFCHR"),
}
target.MakeMmap = targets.MakePosixMmap(target)
- target.SanitizeCall = arch.SanitizeCall
+ target.Neutralize = arch.neutralize
target.AnnotateCall = arch.annotateCall
}
type arch struct {
- unix *targets.UnixSanitizer
+ unix *targets.UnixNeutralizer
DIOCKILLSTATES uint64
S_IFMT uint64
S_IFCHR uint64
@@ -72,7 +72,7 @@ func isKcovFd(dev uint64) bool {
return major == devFdMajor && minor >= kcovFdMinorMin && minor < kcovFdMinorMax
}
-func (arch *arch) SanitizeCall(c *prog.Call) {
+func (arch *arch) neutralize(c *prog.Call) {
argStart := 1
switch c.Meta.CallName {
case "chflagsat":
@@ -169,7 +169,7 @@ func (arch *arch) SanitizeCall(c *prog.Call) {
}
}
default:
- arch.unix.SanitizeCall(c)
+ arch.unix.Neutralize(c)
}
}
diff --git a/sys/openbsd/init_test.go b/sys/openbsd/init_test.go
index 6895ce3c9..30937bade 100644
--- a/sys/openbsd/init_test.go
+++ b/sys/openbsd/init_test.go
@@ -10,7 +10,7 @@ import (
_ "github.com/google/syzkaller/sys/openbsd/gen"
)
-func TestSanitizeCall(t *testing.T) {
+func TestNeutralize(t *testing.T) {
prog.TestDeserializeHelper(t, "openbsd", "amd64", nil, []prog.DeserializeTest{
{
In: `chflagsat(0x0, 0x0, 0x60004, 0x0)`,
diff --git a/sys/targets/common.go b/sys/targets/common.go
index 0096bcf75..a5a4838c2 100644
--- a/sys/targets/common.go
+++ b/sys/targets/common.go
@@ -51,7 +51,7 @@ func MakeSyzMmap(target *prog.Target) func(addr, size uint64) *prog.Call {
}
}
-type UnixSanitizer struct {
+type UnixNeutralizer struct {
MAP_FIXED uint64
S_IFREG uint64
S_IFCHR uint64
@@ -60,8 +60,8 @@ type UnixSanitizer struct {
S_IFSOCK uint64
}
-func MakeUnixSanitizer(target *prog.Target) *UnixSanitizer {
- return &UnixSanitizer{
+func MakeUnixNeutralizer(target *prog.Target) *UnixNeutralizer {
+ return &UnixNeutralizer{
MAP_FIXED: target.GetConst("MAP_FIXED"),
S_IFREG: target.GetConst("S_IFREG"),
S_IFCHR: target.GetConst("S_IFCHR"),
@@ -71,7 +71,7 @@ func MakeUnixSanitizer(target *prog.Target) *UnixSanitizer {
}
}
-func (arch *UnixSanitizer) SanitizeCall(c *prog.Call) {
+func (arch *UnixNeutralizer) Neutralize(c *prog.Call) {
switch c.Meta.CallName {
case "mmap":
// Add MAP_FIXED flag, otherwise it produces non-deterministic results.
diff --git a/sys/trusty/init.go b/sys/trusty/init.go
index 5f5335566..d437b5d3f 100644
--- a/sys/trusty/init.go
+++ b/sys/trusty/init.go
@@ -8,14 +8,6 @@ import (
"github.com/google/syzkaller/sys/targets"
)
-type arch struct {
-}
-
func InitTarget(target *prog.Target) {
- arch := &arch{}
target.MakeMmap = targets.MakeSyzMmap(target)
- target.SanitizeCall = arch.sanitizeCall
-}
-
-func (arch *arch) sanitizeCall(c *prog.Call) {
}
generated by ggit (джигит) mrf-deployment (git 2.46.0) at 2026-03-11 22:02:23 +0000