Skip to content

Commit

Permalink
sys/linux: fix SIOCGIFCONF const
Browse files Browse the repository at this point in the history
  • Loading branch information
dvyukov committed Oct 29, 2018
1 parent b36409b commit fe65cc8
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 16 deletions.
10 changes: 5 additions & 5 deletions executor/defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

#if GOARCH_386
#define GOARCH "386"
#define SYZ_REVISION "d151564c9bcca01b10454c2ce2391094cb23dc74"
#define SYZ_REVISION "1b81c45108a9a6425515ceef64dd678d2d77b4c0"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -70,7 +70,7 @@

#if GOARCH_amd64
#define GOARCH "amd64"
#define SYZ_REVISION "4c5a4ea699b8aa4e61b2e233fe0bcb5ec22e1347"
#define SYZ_REVISION "d229fb1b6427ccc38a4e67b466f8ab6ef437da5c"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -80,7 +80,7 @@

#if GOARCH_arm
#define GOARCH "arm"
#define SYZ_REVISION "5ec4083a3cab07dc595ff2d013c29e5c14d627ba"
#define SYZ_REVISION "2f2056c7f7c64f1198b485c45edfabb67899c09c"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -90,7 +90,7 @@

#if GOARCH_arm64
#define GOARCH "arm64"
#define SYZ_REVISION "f981aaafee83a3ace74208809e9065eb1c537804"
#define SYZ_REVISION "b7df7e8ece95a294590bf6a4d920011dc4fdac54"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand All @@ -100,7 +100,7 @@

#if GOARCH_ppc64le
#define GOARCH "ppc64le"
#define SYZ_REVISION "3fc02d61a501f22cb8e8ef68ea913a4221cabe5c"
#define SYZ_REVISION "f0bf177cc80e5b82370a22b8564ea04d8988f871"
#define SYZ_EXECUTOR_USES_FORK_SERVER 1
#define SYZ_EXECUTOR_USES_SHMEM 1
#define SYZ_PAGE_SIZE 4096
Expand Down
5 changes: 3 additions & 2 deletions sys/linux/gen/386.go
Original file line number Diff line number Diff line change
Expand Up @@ -29211,7 +29211,7 @@ var syscalls_386 = []*Syscall{
}},
{NR: 54, Name: "ioctl$sock_SIOCGIFCONF", CallName: "ioctl", Args: []Type{
&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 35088},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 35090},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 4}, Type: &UnionType{Key: StructKey{Name: "ifconf", Dir: 2}}},
}},
{NR: 54, Name: "ioctl$sock_SIOCGIFINDEX", CallName: "ioctl", Args: []Type{
Expand Down Expand Up @@ -39043,6 +39043,7 @@ var consts_386 = []ConstValue{
{Name: "SIOCGIFADDR", Value: 35093},
{Name: "SIOCGIFBR", Value: 35136},
{Name: "SIOCGIFBRDADDR", Value: 35097},
{Name: "SIOCGIFCONF", Value: 35090},
{Name: "SIOCGIFCOUNT", Value: 35128},
{Name: "SIOCGIFDSTADDR", Value: 35095},
{Name: "SIOCGIFENCAP", Value: 35109},
Expand Down Expand Up @@ -41657,4 +41658,4 @@ var consts_386 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_386 = "d151564c9bcca01b10454c2ce2391094cb23dc74"
const revision_386 = "1b81c45108a9a6425515ceef64dd678d2d77b4c0"
5 changes: 3 additions & 2 deletions sys/linux/gen/amd64.go
Original file line number Diff line number Diff line change
Expand Up @@ -29690,7 +29690,7 @@ var syscalls_amd64 = []*Syscall{
}},
{NR: 16, Name: "ioctl$sock_SIOCGIFCONF", CallName: "ioctl", Args: []Type{
&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 35088},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 35090},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &UnionType{Key: StructKey{Name: "ifconf", Dir: 2}}},
}},
{NR: 16, Name: "ioctl$sock_SIOCGIFINDEX", CallName: "ioctl", Args: []Type{
Expand Down Expand Up @@ -39721,6 +39721,7 @@ var consts_amd64 = []ConstValue{
{Name: "SIOCGIFADDR", Value: 35093},
{Name: "SIOCGIFBR", Value: 35136},
{Name: "SIOCGIFBRDADDR", Value: 35097},
{Name: "SIOCGIFCONF", Value: 35090},
{Name: "SIOCGIFCOUNT", Value: 35128},
{Name: "SIOCGIFDSTADDR", Value: 35095},
{Name: "SIOCGIFENCAP", Value: 35109},
Expand Down Expand Up @@ -42360,4 +42361,4 @@ var consts_amd64 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_amd64 = "4c5a4ea699b8aa4e61b2e233fe0bcb5ec22e1347"
const revision_amd64 = "d229fb1b6427ccc38a4e67b466f8ab6ef437da5c"
5 changes: 3 additions & 2 deletions sys/linux/gen/arm.go
Original file line number Diff line number Diff line change
Expand Up @@ -28991,7 +28991,7 @@ var syscalls_arm = []*Syscall{
}},
{NR: 54, Name: "ioctl$sock_SIOCGIFCONF", CallName: "ioctl", Args: []Type{
&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 35088},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 4}}, Val: 35090},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 4}, Type: &UnionType{Key: StructKey{Name: "ifconf", Dir: 2}}},
}},
{NR: 54, Name: "ioctl$sock_SIOCGIFINDEX", CallName: "ioctl", Args: []Type{
Expand Down Expand Up @@ -38915,6 +38915,7 @@ var consts_arm = []ConstValue{
{Name: "SIOCGIFADDR", Value: 35093},
{Name: "SIOCGIFBR", Value: 35136},
{Name: "SIOCGIFBRDADDR", Value: 35097},
{Name: "SIOCGIFCONF", Value: 35090},
{Name: "SIOCGIFCOUNT", Value: 35128},
{Name: "SIOCGIFDSTADDR", Value: 35095},
{Name: "SIOCGIFENCAP", Value: 35109},
Expand Down Expand Up @@ -41528,4 +41529,4 @@ var consts_arm = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_arm = "5ec4083a3cab07dc595ff2d013c29e5c14d627ba"
const revision_arm = "2f2056c7f7c64f1198b485c45edfabb67899c09c"
5 changes: 3 additions & 2 deletions sys/linux/gen/arm64.go
Original file line number Diff line number Diff line change
Expand Up @@ -29314,7 +29314,7 @@ var syscalls_arm64 = []*Syscall{
}},
{NR: 29, Name: "ioctl$sock_SIOCGIFCONF", CallName: "ioctl", Args: []Type{
&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 35088},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 35090},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &UnionType{Key: StructKey{Name: "ifconf", Dir: 2}}},
}},
{NR: 29, Name: "ioctl$sock_SIOCGIFINDEX", CallName: "ioctl", Args: []Type{
Expand Down Expand Up @@ -39152,6 +39152,7 @@ var consts_arm64 = []ConstValue{
{Name: "SIOCGIFADDR", Value: 35093},
{Name: "SIOCGIFBR", Value: 35136},
{Name: "SIOCGIFBRDADDR", Value: 35097},
{Name: "SIOCGIFCONF", Value: 35090},
{Name: "SIOCGIFCOUNT", Value: 35128},
{Name: "SIOCGIFDSTADDR", Value: 35095},
{Name: "SIOCGIFENCAP", Value: 35109},
Expand Down Expand Up @@ -41750,4 +41751,4 @@ var consts_arm64 = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_arm64 = "f981aaafee83a3ace74208809e9065eb1c537804"
const revision_arm64 = "b7df7e8ece95a294590bf6a4d920011dc4fdac54"
5 changes: 3 additions & 2 deletions sys/linux/gen/ppc64le.go
Original file line number Diff line number Diff line change
Expand Up @@ -27781,7 +27781,7 @@ var syscalls_ppc64le = []*Syscall{
}},
{NR: 54, Name: "ioctl$sock_SIOCGIFCONF", CallName: "ioctl", Args: []Type{
&ResourceType{TypeCommon: TypeCommon{TypeName: "sock", FldName: "fd", TypeSize: 4}},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 35088},
&ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 35090},
&PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &UnionType{Key: StructKey{Name: "ifconf", Dir: 2}}},
}},
{NR: 54, Name: "ioctl$sock_SIOCGIFINDEX", CallName: "ioctl", Args: []Type{
Expand Down Expand Up @@ -37453,6 +37453,7 @@ var consts_ppc64le = []ConstValue{
{Name: "SIOCGIFADDR", Value: 35093},
{Name: "SIOCGIFBR", Value: 35136},
{Name: "SIOCGIFBRDADDR", Value: 35097},
{Name: "SIOCGIFCONF", Value: 35090},
{Name: "SIOCGIFCOUNT", Value: 35128},
{Name: "SIOCGIFDSTADDR", Value: 35095},
{Name: "SIOCGIFENCAP", Value: 35109},
Expand Down Expand Up @@ -39108,4 +39109,4 @@ var consts_ppc64le = []ConstValue{
{Name: "bpf_insn_load_imm_dw", Value: 24},
}

const revision_ppc64le = "3fc02d61a501f22cb8e8ef68ea913a4221cabe5c"
const revision_ppc64le = "f0bf177cc80e5b82370a22b8564ea04d8988f871"
2 changes: 1 addition & 1 deletion sys/linux/socket.txt
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ ioctl$sock_SIOCETHTOOL(fd sock, cmd const[SIOCETHTOOL], arg ptr[inout, ifreq_t[p
ioctl$sock_SIOCOUTQ(fd sock, cmd const[SIOCOUTQ], arg ptr[out, int32])
ioctl$sock_SIOCINQ(fd sock, cmd const[SIOCINQ], arg ptr[out, int32])

ioctl$sock_SIOCGIFCONF(fd sock, cmd const[SIOCGIFNAME], arg ptr[inout, ifconf])
ioctl$sock_SIOCGIFCONF(fd sock, cmd const[SIOCGIFCONF], arg ptr[inout, ifconf])

ifreq_ioctls = SIOCGIFNAME, SIOCSIFLINK, SIOCGIFFLAGS, SIOCSIFFLAGS, SIOCGIFADDR, SIOCSIFADDR, SIOCGIFDSTADDR, SIOCSIFDSTADDR, SIOCGIFBRDADDR, SIOCSIFBRDADDR, SIOCGIFNETMASK, SIOCSIFNETMASK, SIOCGIFMETRIC, SIOCSIFMETRIC, SIOCGIFMEM, SIOCSIFMEM, SIOCGIFMTU, SIOCSIFMTU, SIOCSIFNAME, SIOCSIFHWADDR, SIOCGIFENCAP, SIOCSIFENCAP, SIOCGIFHWADDR, SIOCGIFSLAVE, SIOCSIFSLAVE, SIOCADDMULTI, SIOCDELMULTI, SIOCGIFINDEX, SIOCSIFPFLAGS, SIOCGIFPFLAGS, SIOCDIFADDR, SIOCSIFHWBROADCAST, SIOCGIFCOUNT, SIOCGIFTXQLEN, SIOCSIFTXQLEN, SIOCETHTOOL, SIOCGMIIPHY, SIOCGMIIREG, SIOCSMIIREG, SIOCWANDEV, SIOCGIFMAP, SIOCSIFMAP, SIOCBONDENSLAVE, SIOCBONDRELEASE, SIOCBONDSETHWADDR, SIOCBONDSLAVEINFOQUERY, SIOCBONDINFOQUERY, SIOCBONDCHANGEACTIVE, SIOCBRADDIF, SIOCBRDELIF, SIOCSHWTSTAMP, SIOCGHWTSTAMP

Expand Down
1 change: 1 addition & 0 deletions sys/linux/socket_386.const
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ SIOCGHWTSTAMP = 35249
SIOCGIFADDR = 35093
SIOCGIFBR = 35136
SIOCGIFBRDADDR = 35097
SIOCGIFCONF = 35090
SIOCGIFCOUNT = 35128
SIOCGIFDSTADDR = 35095
SIOCGIFENCAP = 35109
Expand Down
1 change: 1 addition & 0 deletions sys/linux/socket_amd64.const
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ SIOCGHWTSTAMP = 35249
SIOCGIFADDR = 35093
SIOCGIFBR = 35136
SIOCGIFBRDADDR = 35097
SIOCGIFCONF = 35090
SIOCGIFCOUNT = 35128
SIOCGIFDSTADDR = 35095
SIOCGIFENCAP = 35109
Expand Down
1 change: 1 addition & 0 deletions sys/linux/socket_arm.const
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ SIOCGHWTSTAMP = 35249
SIOCGIFADDR = 35093
SIOCGIFBR = 35136
SIOCGIFBRDADDR = 35097
SIOCGIFCONF = 35090
SIOCGIFCOUNT = 35128
SIOCGIFDSTADDR = 35095
SIOCGIFENCAP = 35109
Expand Down
1 change: 1 addition & 0 deletions sys/linux/socket_arm64.const
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ SIOCGHWTSTAMP = 35249
SIOCGIFADDR = 35093
SIOCGIFBR = 35136
SIOCGIFBRDADDR = 35097
SIOCGIFCONF = 35090
SIOCGIFCOUNT = 35128
SIOCGIFDSTADDR = 35095
SIOCGIFENCAP = 35109
Expand Down
1 change: 1 addition & 0 deletions sys/linux/socket_ppc64le.const
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ SIOCGHWTSTAMP = 35249
SIOCGIFADDR = 35093
SIOCGIFBR = 35136
SIOCGIFBRDADDR = 35097
SIOCGIFCONF = 35090
SIOCGIFCOUNT = 35128
SIOCGIFDSTADDR = 35095
SIOCGIFENCAP = 35109
Expand Down

0 comments on commit fe65cc8

Please sign in to comment.