sys/linux: fix IP6T_SO_GET_INFO const

Fix copy-paste error.
google · Oct 29, 2018 · b36409b · b36409b
1 parent 7df9db2
commit b36409b
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 16 deletions.
diff --git a/executor/defs.h b/executor/defs.h
@@ -60,7 +60,7 @@
 
 #if GOARCH_386
 #define GOARCH "386"
-#define SYZ_REVISION "c58e0ef3bec0adabbacb58c0f68cf210ec99bed3"
+#define SYZ_REVISION "d151564c9bcca01b10454c2ce2391094cb23dc74"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -70,7 +70,7 @@
 
 #if GOARCH_amd64
 #define GOARCH "amd64"
-#define SYZ_REVISION "c543412fe478411344f57567f308a77b569e679e"
+#define SYZ_REVISION "4c5a4ea699b8aa4e61b2e233fe0bcb5ec22e1347"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -80,7 +80,7 @@
 
 #if GOARCH_arm
 #define GOARCH "arm"
-#define SYZ_REVISION "1b895defe0d82254347dcf6ea67a6b6066070556"
+#define SYZ_REVISION "5ec4083a3cab07dc595ff2d013c29e5c14d627ba"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -90,7 +90,7 @@
 
 #if GOARCH_arm64
 #define GOARCH "arm64"
-#define SYZ_REVISION "9bda36ff0150a1c23a6ae08213c71d6c28538959"
+#define SYZ_REVISION "f981aaafee83a3ace74208809e9065eb1c537804"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096
@@ -100,7 +100,7 @@
 
 #if GOARCH_ppc64le
 #define GOARCH "ppc64le"
-#define SYZ_REVISION "2cc9b537a309fd760f2d39bef892085021ec109a"
+#define SYZ_REVISION "3fc02d61a501f22cb8e8ef68ea913a4221cabe5c"
 #define SYZ_EXECUTOR_USES_FORK_SERVER 1
 #define SYZ_EXECUTOR_USES_SHMEM 1
 #define SYZ_PAGE_SIZE 4096

diff --git a/sys/linux/gen/386.go b/sys/linux/gen/386.go
@@ -36904,6 +36904,7 @@ var consts_386 = []ConstValue{
 	{Name: "IP6T_RT_SGS", Value: 2},
 	{Name: "IP6T_RT_TYP", Value: 1},
 	{Name: "IP6T_SO_GET_ENTRIES", Value: 65},
+	{Name: "IP6T_SO_GET_INFO", Value: 64},
 	{Name: "IP6T_SO_GET_REVISION_MATCH", Value: 68},
 	{Name: "IP6T_SO_GET_REVISION_TARGET", Value: 69},
 	{Name: "IP6T_SO_ORIGINAL_DST", Value: 80},
@@ -41656,4 +41657,4 @@ var consts_386 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_386 = "c58e0ef3bec0adabbacb58c0f68cf210ec99bed3"
+const revision_386 = "d151564c9bcca01b10454c2ce2391094cb23dc74"
diff --git a/sys/linux/gen/amd64.go b/sys/linux/gen/amd64.go
@@ -37582,6 +37582,7 @@ var consts_amd64 = []ConstValue{
 	{Name: "IP6T_RT_SGS", Value: 2},
 	{Name: "IP6T_RT_TYP", Value: 1},
 	{Name: "IP6T_SO_GET_ENTRIES", Value: 65},
+	{Name: "IP6T_SO_GET_INFO", Value: 64},
 	{Name: "IP6T_SO_GET_REVISION_MATCH", Value: 68},
 	{Name: "IP6T_SO_GET_REVISION_TARGET", Value: 69},
 	{Name: "IP6T_SO_ORIGINAL_DST", Value: 80},
@@ -42359,4 +42360,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_amd64 = "c543412fe478411344f57567f308a77b569e679e"
+const revision_amd64 = "4c5a4ea699b8aa4e61b2e233fe0bcb5ec22e1347"
diff --git a/sys/linux/gen/arm.go b/sys/linux/gen/arm.go
@@ -36828,6 +36828,7 @@ var consts_arm = []ConstValue{
 	{Name: "IP6T_RT_SGS", Value: 2},
 	{Name: "IP6T_RT_TYP", Value: 1},
 	{Name: "IP6T_SO_GET_ENTRIES", Value: 65},
+	{Name: "IP6T_SO_GET_INFO", Value: 64},
 	{Name: "IP6T_SO_GET_REVISION_MATCH", Value: 68},
 	{Name: "IP6T_SO_GET_REVISION_TARGET", Value: 69},
 	{Name: "IP6T_SO_ORIGINAL_DST", Value: 80},
@@ -41527,4 +41528,4 @@ var consts_arm = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm = "1b895defe0d82254347dcf6ea67a6b6066070556"
+const revision_arm = "5ec4083a3cab07dc595ff2d013c29e5c14d627ba"
diff --git a/sys/linux/gen/arm64.go b/sys/linux/gen/arm64.go
@@ -37060,6 +37060,7 @@ var consts_arm64 = []ConstValue{
 	{Name: "IP6T_RT_SGS", Value: 2},
 	{Name: "IP6T_RT_TYP", Value: 1},
 	{Name: "IP6T_SO_GET_ENTRIES", Value: 65},
+	{Name: "IP6T_SO_GET_INFO", Value: 64},
 	{Name: "IP6T_SO_GET_REVISION_MATCH", Value: 68},
 	{Name: "IP6T_SO_GET_REVISION_TARGET", Value: 69},
 	{Name: "IP6T_SO_ORIGINAL_DST", Value: 80},
@@ -41749,4 +41750,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm64 = "9bda36ff0150a1c23a6ae08213c71d6c28538959"
+const revision_arm64 = "f981aaafee83a3ace74208809e9065eb1c537804"
diff --git a/sys/linux/gen/ppc64le.go b/sys/linux/gen/ppc64le.go
@@ -35455,6 +35455,7 @@ var consts_ppc64le = []ConstValue{
 	{Name: "IP6T_RT_SGS", Value: 2},
 	{Name: "IP6T_RT_TYP", Value: 1},
 	{Name: "IP6T_SO_GET_ENTRIES", Value: 65},
+	{Name: "IP6T_SO_GET_INFO", Value: 64},
 	{Name: "IP6T_SO_GET_REVISION_MATCH", Value: 68},
 	{Name: "IP6T_SO_GET_REVISION_TARGET", Value: 69},
 	{Name: "IP6T_SO_ORIGINAL_DST", Value: 80},
@@ -39107,4 +39108,4 @@ var consts_ppc64le = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_ppc64le = "2cc9b537a309fd760f2d39bef892085021ec109a"
+const revision_ppc64le = "3fc02d61a501f22cb8e8ef68ea913a4221cabe5c"
diff --git a/sys/linux/netfilter_ipv6.txt b/sys/linux/netfilter_ipv6.txt
@@ -16,7 +16,7 @@ include <uapi/linux/netfilter_ipv6/ip6t_HL.h>
 
 setsockopt$IP6T_SO_SET_REPLACE(fd sock_in6, level const[SOL_IPV6], opt const[IP6T_SO_SET_REPLACE], val ptr[in, ip6t_replace], len len[val])
 setsockopt$IP6T_SO_SET_ADD_COUNTERS(fd sock_in6, level const[SOL_IPV6], opt const[IP6T_SO_SET_ADD_COUNTERS], val ptr[in, ipt_counters_info], len len[val])
-getsockopt$IP6T_SO_GET_INFO(fd sock_in6, level const[SOL_IPV6], opt const[IPT_SO_GET_INFO], val ptr[in, ipt_getinfo], len ptr[in, len[val, int32]])
+getsockopt$IP6T_SO_GET_INFO(fd sock_in6, level const[SOL_IPV6], opt const[IP6T_SO_GET_INFO], val ptr[in, ipt_getinfo], len ptr[in, len[val, int32]])
 getsockopt$IP6T_SO_GET_ENTRIES(fd sock_in6, level const[SOL_IPV6], opt const[IP6T_SO_GET_ENTRIES], val ptr[in, ipt_get_entries], len ptr[in, len[val, int32]])
 getsockopt$IP6T_SO_GET_REVISION_MATCH(fd sock_in6, level const[SOL_IPV6], opt const[IP6T_SO_GET_REVISION_MATCH], val ptr[in, xt_get_revision], len ptr[in, len[val, int32]])
 getsockopt$IP6T_SO_GET_REVISION_TARGET(fd sock_in6, level const[SOL_IPV6], opt const[IP6T_SO_GET_REVISION_TARGET], val ptr[in, xt_get_revision], len ptr[in, len[val, int32]])

diff --git a/sys/linux/netfilter_ipv6_386.const b/sys/linux/netfilter_ipv6_386.const
@@ -45,6 +45,7 @@ IP6T_RT_RES = 8
 IP6T_RT_SGS = 2
 IP6T_RT_TYP = 1
 IP6T_SO_GET_ENTRIES = 65
+IP6T_SO_GET_INFO = 64
 IP6T_SO_GET_REVISION_MATCH = 68
 IP6T_SO_GET_REVISION_TARGET = 69
 IP6T_SO_SET_ADD_COUNTERS = 65
@@ -69,7 +70,6 @@ IP6T_TCP_RESET = 6
 # IPT_NAT_VALID_HOOKS is not set
 # IPT_RAW_VALID_HOOKS is not set
 # IPT_SECURITY_VALID_HOOKS is not set
-# IPT_SO_GET_INFO is not set
 MASK_AH = 8
 MASK_DSTOPTS = 64
 MASK_ESP = 4

diff --git a/sys/linux/netfilter_ipv6_amd64.const b/sys/linux/netfilter_ipv6_amd64.const
@@ -45,6 +45,7 @@ IP6T_RT_RES = 8
 IP6T_RT_SGS = 2
 IP6T_RT_TYP = 1
 IP6T_SO_GET_ENTRIES = 65
+IP6T_SO_GET_INFO = 64
 IP6T_SO_GET_REVISION_MATCH = 68
 IP6T_SO_GET_REVISION_TARGET = 69
 IP6T_SO_SET_ADD_COUNTERS = 65
@@ -69,7 +70,6 @@ IP6T_TCP_RESET = 6
 # IPT_NAT_VALID_HOOKS is not set
 # IPT_RAW_VALID_HOOKS is not set
 # IPT_SECURITY_VALID_HOOKS is not set
-# IPT_SO_GET_INFO is not set
 MASK_AH = 8
 MASK_DSTOPTS = 64
 MASK_ESP = 4

diff --git a/sys/linux/netfilter_ipv6_arm.const b/sys/linux/netfilter_ipv6_arm.const
@@ -45,6 +45,7 @@ IP6T_RT_RES = 8
 IP6T_RT_SGS = 2
 IP6T_RT_TYP = 1
 IP6T_SO_GET_ENTRIES = 65
+IP6T_SO_GET_INFO = 64
 IP6T_SO_GET_REVISION_MATCH = 68
 IP6T_SO_GET_REVISION_TARGET = 69
 IP6T_SO_SET_ADD_COUNTERS = 65
@@ -69,7 +70,6 @@ IP6T_TCP_RESET = 6
 # IPT_NAT_VALID_HOOKS is not set
 # IPT_RAW_VALID_HOOKS is not set
 # IPT_SECURITY_VALID_HOOKS is not set
-# IPT_SO_GET_INFO is not set
 MASK_AH = 8
 MASK_DSTOPTS = 64
 MASK_ESP = 4

diff --git a/sys/linux/netfilter_ipv6_arm64.const b/sys/linux/netfilter_ipv6_arm64.const
@@ -45,6 +45,7 @@ IP6T_RT_RES = 8
 IP6T_RT_SGS = 2
 IP6T_RT_TYP = 1
 IP6T_SO_GET_ENTRIES = 65
+IP6T_SO_GET_INFO = 64
 IP6T_SO_GET_REVISION_MATCH = 68
 IP6T_SO_GET_REVISION_TARGET = 69
 IP6T_SO_SET_ADD_COUNTERS = 65
@@ -69,7 +70,6 @@ IP6T_TCP_RESET = 6
 # IPT_NAT_VALID_HOOKS is not set
 # IPT_RAW_VALID_HOOKS is not set
 # IPT_SECURITY_VALID_HOOKS is not set
-# IPT_SO_GET_INFO is not set
 MASK_AH = 8
 MASK_DSTOPTS = 64
 MASK_ESP = 4

diff --git a/sys/linux/netfilter_ipv6_ppc64le.const b/sys/linux/netfilter_ipv6_ppc64le.const
@@ -45,6 +45,7 @@ IP6T_RT_RES = 8
 IP6T_RT_SGS = 2
 IP6T_RT_TYP = 1
 IP6T_SO_GET_ENTRIES = 65
+IP6T_SO_GET_INFO = 64
 IP6T_SO_GET_REVISION_MATCH = 68
 IP6T_SO_GET_REVISION_TARGET = 69
 IP6T_SO_SET_ADD_COUNTERS = 65
@@ -69,7 +70,6 @@ IP6T_TCP_RESET = 6
 # IPT_NAT_VALID_HOOKS is not set
 # IPT_RAW_VALID_HOOKS is not set
 # IPT_SECURITY_VALID_HOOKS is not set
-# IPT_SO_GET_INFO is not set
 MASK_AH = 8
 MASK_DSTOPTS = 64
 MASK_ESP = 4