opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

credentials/alts: Ensure that GetBytesConsumed is in-bound (#3225)

Browse Source
This commit is contained in:
Cesar Ghali
2019-12-03 22:21:17 -08:00
committed by GitHub
parent 22854c88e0
commit 14426e9c3a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
credentials/alts/internal/handshaker/handshaker.go
View File

@ -64,6 +64,9 @@ var (
concurrentHandshakes = int64(0) concurrentHandshakes = int64(0)
// errDropped occurs when maxPendingHandshakes is reached. // errDropped occurs when maxPendingHandshakes is reached.
errDropped = errors.New("maximum number of concurrent ALTS handshakes is reached") errDropped = errors.New("maximum number of concurrent ALTS handshakes is reached")
// errOutOfBound occurs when the handshake service returns a consumed
// bytes value larger than the buffer that was passed to it originally.
errOutOfBound = errors.New("handshaker service consumed bytes value is out-of-bound")
) )
func init() { func init() {
@ -284,6 +287,9 @@ func (h *altsHandshaker) doHandshake(req *altspb.HandshakerReq) (net.Conn, *alts
var extra []byte var extra []byte
if req.GetServerStart() != nil { if req.GetServerStart() != nil {
if resp.GetBytesConsumed() > uint32(len(req.GetServerStart().GetInBytes())) {
return nil, nil, errOutOfBound
}
extra = req.GetServerStart().GetInBytes()[resp.GetBytesConsumed():] extra = req.GetServerStart().GetInBytes()[resp.GetBytesConsumed():]
} }
result, extra, err := h.processUntilDone(resp, extra) result, extra, err := h.processUntilDone(resp, extra)
@ -355,6 +361,9 @@ func (h *altsHandshaker) processUntilDone(resp *altspb.HandshakerResp, extra []b
return nil, nil, err return nil, nil, err
} }
// Set extra based on handshaker service response. // Set extra based on handshaker service response.
if resp.GetBytesConsumed() > uint32(len(p)) {
return nil, nil, errOutOfBound
}
extra = p[resp.GetBytesConsumed():] extra = p[resp.GetBytesConsumed():]
} }
} }