Skip to content

Commit 59a9009

Browse files
authored
Merge pull request #2920 from tamird/stricter-reading
vz: qemuPacketConn: Disallow partial reads
2 parents 3c33a12 + d1340c7 commit 59a9009

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

pkg/vz/network_darwin.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,7 @@ func (c *qemuPacketConn) Read(b []byte) (n int, err error) {
9696
// Likely connection closed by peer.
9797
return 0, err
9898
}
99-
100-
reader := io.LimitReader(c.Conn, int64(size))
101-
_, err = reader.Read(b)
102-
if err != nil {
103-
// Likely connection closed by peer.
104-
return 0, err
105-
}
106-
return int(size), nil
99+
return io.ReadFull(c.Conn, b[:size])
107100
}
108101

109102
// Write writes a QEMU packet containing the raw packet. Returns (len(b), nil)

0 commit comments

Comments
 (0)