fix wrong SizeOfTCPInfo

Jianfeng Tan · Jianfeng Tan · commit 09270853366a · 2019-08-02T08:28:47.000Z
Below command under hostinet network will lead to panic: $ cat /proc/net/tcp It's caused by the wrong SizeOfTCPInfo. #0 runtime.panicindex() google#1 encoding/binary.littleEndian.Uint64 google#2 encoding/binary.(*littleEndian).Uint64 google#3 gvisor.dev/gvisor/pkg/binary.unmarshal google#4 gvisor.dev/gvisor/pkg/binary.unmarshal google#5 gvisor.dev/gvisor/pkg/binary.Unmarshal google#6 gvisor.dev/gvisor/pkg/sentry/socket/hostinet.(*socketOperations).State google#7 gvisor.dev/gvisor/pkg/sentry/fs/proc.(*netTCP).ReadSeqFileData Correct SizeOfTCPInfo from 104 to 192 to fix it. Fixes google#640 Signed-off-by: Jianfeng Tan <henry.tjf@antfin.com>
diff --git a/pkg/abi/linux/socket.go b/pkg/abi/linux/socket.go
@@ -352,7 +352,7 @@ type TCPInfo struct {
 }
 
 // SizeOfTCPInfo is the binary size of a TCPInfo struct.
-const SizeOfTCPInfo = 104
+const SizeOfTCPInfo = 192
 
 // Control message types, from linux/socket.h.
 const (

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ type TCPInfo struct {`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`// SizeOfTCPInfo is the binary size of a TCPInfo struct.`
`355`		`-const SizeOfTCPInfo = 104`
	`355`	`+const SizeOfTCPInfo = 192`
`356`	`356`
`357`	`357`	`// Control message types, from linux/socket.h.`
`358`	`358`	`const (`