diff options
author | Paul McLean <pmclean@google.com> | 2019-12-16 15:44:13 -0700 |
---|---|---|
committer | Paul Mclean <pmclean@google.com> | 2020-02-06 22:14:35 +0000 |
commit | 0fef164d3d1f5c4e963b8142c6f9bee2ab1becc8 (patch) | |
tree | 010fd5704df43b73287aee7b20d889978fbaeb2a | |
parent | 66e4b1d1cce6d6ee2006e56af215bb20cb9ea820 (diff) | |
download | voip-0fef164d3d1f5c4e963b8142c6f9bee2ab1becc8.tar.gz |
Add buffer size checks to eliminate security vulnerability.
Bug:140054506
Test: This will need to be tested by bferris@ as I don't have the
facilities to test this.
Change-Id: I5977e216bcaecd4ed10c0a991bed2860e6d627d9
Merged-In: I5977e216bcaecd4ed10c0a991bed2860e6d627d9
-rw-r--r-- | src/jni/rtp/AudioGroup.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp index aa3fc66..e01fbca 100644 --- a/src/jni/rtp/AudioGroup.cpp +++ b/src/jni/rtp/AudioGroup.cpp @@ -412,20 +412,29 @@ void AudioStream::decode(int tick) sockaddr_storage remote; socklen_t addrlen = sizeof(remote); - int length = recvfrom(mSocket, buffer, sizeof(buffer), + int bufferSize = sizeof(buffer); + int length = recvfrom(mSocket, buffer, bufferSize, MSG_TRUNC | MSG_DONTWAIT, (sockaddr *)&remote, &addrlen); // Do we need to check SSRC, sequence, and timestamp? They are not // reliable but at least they can be used to identify duplicates? - if (length < 12 || length > (int)sizeof(buffer) || + if (length < 12 || length > bufferSize || (ntohl(*(uint32_t *)buffer) & 0xC07F0000) != mCodecMagic) { ALOGV("stream[%d] malformed packet", mSocket); return; } int offset = 12 + ((buffer[0] & 0x0F) << 2); + if (offset+2 >= bufferSize) { + ALOGV("invalid buffer offset: %d", offset+2); + return; + } if ((buffer[0] & 0x10) != 0) { offset += 4 + (ntohs(*(uint16_t *)&buffer[offset + 2]) << 2); } + if (offset >= bufferSize) { + ALOGV("invalid buffer offset: %d", offset); + return; + } if ((buffer[0] & 0x20) != 0) { length -= buffer[length - 1]; } |