From 1e22c7aefac180517e07caaf8bec42138ce6314c Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 13 Aug 2016 09:16:28 -0700 Subject: sys: use ranged int in few syscalls so that it is tested --- sys/input.txt | 2 +- sys/sndtimer.txt | 2 +- sys/sys.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/input.txt b/sys/input.txt index 08ad24958..bd597e873 100644 --- a/sys/input.txt +++ b/sys/input.txt @@ -62,7 +62,7 @@ input_event { input_keymap_entry { flags int8 - len int8 + len int8[0:32] index int16 keycode int32 scancod array[int8, 32] diff --git a/sys/sndtimer.txt b/sys/sndtimer.txt index 13e5cb476..839b80da1 100644 --- a/sys/sndtimer.txt +++ b/sys/sndtimer.txt @@ -5,7 +5,7 @@ syz_open_dev$sndtimer(dev strconst["/dev/snd/timer"], id const[0], flags flags[o ioctl$SNDRV_TIMER_IOCTL_PVERSION(fd fd[sndtimer], cmd const[SNDRV_TIMER_IOCTL_PVERSION], arg ptr[out, int32]) ioctl$SNDRV_TIMER_IOCTL_NEXT_DEVICE(fd fd[sndtimer], cmd const[SNDRV_TIMER_IOCTL_NEXT_DEVICE], arg ptr[in, snd_timer_id]) -ioctl$SNDRV_TIMER_IOCTL_TREAD(fd fd[sndtimer], cmd const[SNDRV_TIMER_IOCTL_TREAD], arg ptr[in, int32]) +ioctl$SNDRV_TIMER_IOCTL_TREAD(fd fd[sndtimer], cmd const[SNDRV_TIMER_IOCTL_TREAD], arg ptr[in, int32[0:1]]) ioctl$SNDRV_TIMER_IOCTL_GINFO(fd fd[sndtimer], cmd const[SNDRV_TIMER_IOCTL_GINFO], arg ptr[in, snd_timer_ginfo]) ioctl$SNDRV_TIMER_IOCTL_GPARAMS(fd fd[sndtimer], cmd const[SNDRV_TIMER_IOCTL_GPARAMS], arg ptr[in, snd_timer_gparams]) ioctl$SNDRV_TIMER_IOCTL_GSTATUS(fd fd[sndtimer], cmd const[SNDRV_TIMER_IOCTL_GSTATUS], arg ptr[in, snd_timer_gstatus]) diff --git a/sys/sys.go b/sys/sys.go index b929fbd21..829092396 100644 --- a/sys/sys.go +++ b/sys/sys.go @@ -2860,7 +2860,7 @@ func initCalls() { Calls = append(Calls, &Call{ID: 952, Name: "ioctl$SNDRV_TIMER_IOCTL_NEXT_DEVICE", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSndTimer}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(3222557697)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "snd_timer_id", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "class", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "subcl", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "card", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "dev", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "subdev", IsOptional: false}, TypeSize: 4}}}, Dir: DirIn}}}) }() func() { - Calls = append(Calls, &Call{ID: 953, Name: "ioctl$SNDRV_TIMER_IOCTL_TREAD", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSndTimer}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(1074025474)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 4}, Dir: DirIn}}}) + Calls = append(Calls, &Call{ID: 953, Name: "ioctl$SNDRV_TIMER_IOCTL_TREAD", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSndTimer}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(1074025474)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 4, Kind: IntRange, RangeBegin: 0, RangeEnd: 1}, Dir: DirIn}}}) }() func() { Calls = append(Calls, &Call{ID: 954, Name: "ioctl$SNDRV_TIMER_IOCTL_GINFO", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdSndTimer}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(3237499907)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "snd_timer_ginfo", IsOptional: false}, Fields: []Type{StructType{TypeCommon: TypeCommon{TypeName: "snd_timer_id", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "class", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "subcl", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "card", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "dev", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "subdev", IsOptional: false}, TypeSize: 4}}}, IntType{TypeCommon: TypeCommon{TypeName: "flags", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "card", IsOptional: false}, TypeSize: 4}, ArrayType{TypeCommon: TypeCommon{TypeName: "id", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 64}, ArrayType{TypeCommon: TypeCommon{TypeName: "name", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 80}, ConstType{TypeCommon: TypeCommon{TypeName: "pad", IsOptional: false}, TypeSize: 8, Val: uintptr(0)}, IntType{TypeCommon: TypeCommon{TypeName: "res", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "resmin", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "resmax", IsOptional: false}, TypeSize: 8}, IntType{TypeCommon: TypeCommon{TypeName: "clients", IsOptional: false}, TypeSize: 4}, ArrayType{TypeCommon: TypeCommon{TypeName: "pad", IsOptional: false}, Type: ConstType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1, Val: uintptr(0)}, Len: 32}}}, Dir: DirIn}}}) @@ -3058,7 +3058,7 @@ func initCalls() { Calls = append(Calls, &Call{ID: 1018, Name: "ioctl$EVIOCSKEYCODE", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdInputEvent}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(1074283780)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: ArrayType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 4}, Len: 2}, Dir: DirIn}}}) }() func() { - Calls = append(Calls, &Call{ID: 1019, Name: "ioctl$EVIOCSKEYCODE_V2", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdInputEvent}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(1076380932)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "input_keymap_entry", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "flags", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "index", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "keycode", IsOptional: false}, TypeSize: 4}, ArrayType{TypeCommon: TypeCommon{TypeName: "scancod", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 32}}}, Dir: DirIn}}}) + Calls = append(Calls, &Call{ID: 1019, Name: "ioctl$EVIOCSKEYCODE_V2", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdInputEvent}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(1076380932)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "input_keymap_entry", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "flags", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, TypeSize: 1, Kind: IntRange, RangeBegin: 0, RangeEnd: 32}, IntType{TypeCommon: TypeCommon{TypeName: "index", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "keycode", IsOptional: false}, TypeSize: 4}, ArrayType{TypeCommon: TypeCommon{TypeName: "scancod", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 32}}}, Dir: DirIn}}}) }() func() { Calls = append(Calls, &Call{ID: 1020, Name: "ioctl$EVIOCSFF", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdInputEvent}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(1076905344)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "ff_effect", IsOptional: false}, Fields: []Type{FlagsType{TypeCommon: TypeCommon{TypeName: "type", IsOptional: false}, TypeSize: 2, Vals: []uintptr{81, 82, 83, 84, 85, 86, 87}}, IntType{TypeCommon: TypeCommon{TypeName: "id", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "dir", IsOptional: false}, TypeSize: 2}, StructType{TypeCommon: TypeCommon{TypeName: "ff_trigger", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "button", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "interv", IsOptional: false}, TypeSize: 2}}}, StructType{TypeCommon: TypeCommon{TypeName: "ff_replay", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "delay", IsOptional: false}, TypeSize: 2}}}, UnionType{TypeCommon: TypeCommon{TypeName: "ff_effect_u", IsOptional: false}, Options: []Type{StructType{TypeCommon: TypeCommon{TypeName: "ff_constant_effect", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 2}, StructType{TypeCommon: TypeCommon{TypeName: "ff_envelope", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "flen", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "flevel", IsOptional: false}, TypeSize: 2}}}}}, StructType{TypeCommon: TypeCommon{TypeName: "ff_ramp_effect", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "slevel", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "elevel", IsOptional: false}, TypeSize: 2}, StructType{TypeCommon: TypeCommon{TypeName: "ff_envelope", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "flen", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "flevel", IsOptional: false}, TypeSize: 2}}}}}, StructType{TypeCommon: TypeCommon{TypeName: "ff_periodic_effect", IsOptional: false}, Fields: []Type{FlagsType{TypeCommon: TypeCommon{TypeName: "wave", IsOptional: false}, TypeSize: 2, Vals: []uintptr{88, 89, 90, 91, 92, 93}}, IntType{TypeCommon: TypeCommon{TypeName: "period", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "magnit", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "offset", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "phase", IsOptional: false}, TypeSize: 2}, StructType{TypeCommon: TypeCommon{TypeName: "ff_envelope", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "level", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "flen", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "flevel", IsOptional: false}, TypeSize: 2}}}, LenType{TypeCommon: TypeCommon{TypeName: "len", IsOptional: false}, Buf: "custom", TypeSize: 4, ByteSize: false}, ArrayType{TypeCommon: TypeCommon{TypeName: "custom", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 2}, Len: 0}}}, ArrayType{TypeCommon: TypeCommon{TypeName: "cond", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "ff_condition_effect", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "rsatur", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "lsatur", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "rcoeff", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "lcoeff", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "dead", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "center", IsOptional: false}, TypeSize: 2}}}, Len: 2}, StructType{TypeCommon: TypeCommon{TypeName: "ff_rumble_effect", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "smagnit", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "wmagnit", IsOptional: false}, TypeSize: 2}}}}}}}, Dir: DirIn}}}) -- cgit mrf-deployment