diff options
author | Paul McLean <pmclean@google.com> | 2020-03-18 22:28:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-18 22:28:59 +0000 |
commit | a0c32a843428484b7d4e5496d19c3a68a0c8c98d (patch) | |
tree | 71c79ea264ae9ad21823b08674f61ed8f0e54350 /src | |
parent | b07700fddd4aa93707621e3f094f57c40cee48e3 (diff) | |
parent | 0fef164d3d1f5c4e963b8142c6f9bee2ab1becc8 (diff) | |
download | voip-a0c32a843428484b7d4e5496d19c3a68a0c8c98d.tar.gz |
Add buffer size checks to eliminate security vulnerability. am: 0fef164d3d
Change-Id: Ifb03c3496ac450201fc205708a66de4bc7db5a9c
Diffstat (limited to 'src')
-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 0c97f9f..8bb543c 100644 --- a/src/jni/rtp/AudioGroup.cpp +++ b/src/jni/rtp/AudioGroup.cpp @@ -410,20 +410,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]; } |