clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-30 14:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

exp/ssh: fix two flow control bugs in chanWriter

Browse Source 
This CL fixes two issues sending data to the remote peer.
The first bug occurs when the size of the buffer passed to
Write is larger than the current window, in this case, w.rwin
can become negative.

The second issue is more problematic than the first as the
amount of data passed to writePacket was not limited to w.rwin.
In this case the remote peer could silently drop the additional
data, or drop the connection.

Credit to Jacek Masiulaniec for the bug report.

R=agl, jacek.masiulaniec
CC=golang-dev
https://golang.org/cl/5511043
This commit is contained in:
Dave Cheney 2012-01-04 10:36:21 -05:00 committed by Adam Langley
parent 9d92676f63
commit 424f53fa0c
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/pkg/exp/ssh/client.go
View File

@ -420,27 +420,37 @@ type chanWriter struct {
} }
// Write writes data to the remote process's standard input. // Write writes data to the remote process's standard input.
func (w *chanWriter) Write(data []byte) (n int, err error) { func (w *chanWriter) Write(data []byte) (written int, err error) {
for { for len(data) > 0 {
if w.rwin == 0 { for w.rwin < 1 {
win, ok := <-w.win win, ok := <-w.win
if !ok { if !ok {
return 0, io.EOF return 0, io.EOF
} }
w.rwin += win w.rwin += win
continue
} }
n := min(len(data), w.rwin)
peersId := w.clientChan.peersId peersId := w.clientChan.peersId
n = len(data) packet := []byte{
packet := make([]byte, 0, 9+n) msgChannelData,
packet = append(packet, msgChannelData, byte(peersId >> 24), byte(peersId >> 16), byte(peersId >> 8), byte(peersId),
byte(peersId>>24), byte(peersId>>16), byte(peersId>>8), byte(peersId), byte(n >> 24), byte(n >> 16), byte(n >> 8), byte(n),
byte(n>>24), byte(n>>16), byte(n>>8), byte(n)) }
err = w.clientChan.writePacket(append(packet, data...)) if err = w.clientChan.writePacket(append(packet, data[:n]...)); err != nil {
break
}
data = data[n:]
w.rwin -= n w.rwin -= n
return written += n
} }
panic("unreachable") return
}
func min(a, b int) int {
if a < b {
return a
}
return b
} }
func (w *chanWriter) Close() error { func (w *chanWriter) Close() error {