diff options
| author | Eric Laurent <elaurent@google.com> | 2015-03-25 20:25:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-25 20:25:03 +0000 |
| commit | c42c4b526422fada02f3522a08143f738e9e60af (patch) | |
| tree | 055d8f09c85491920c54dced2498f2dc1c4103cf /media | |
| parent | faefd08b11d1f4955b5da6c10e1a9be1a5cbefad (diff) | |
| parent | 424324b327cc0b022ff8d10e03158b4594489ee7 (diff) | |
| download | frameworks_av-c42c4b526422fada02f3522a08143f738e9e60af.zip frameworks_av-c42c4b526422fada02f3522a08143f738e9e60af.tar.gz frameworks_av-c42c4b526422fada02f3522a08143f738e9e60af.tar.bz2 | |
am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible memory overflow
* commit '424324b327cc0b022ff8d10e03158b4594489ee7':
DO NOT MERGE - audio policy service: fix possible memory overflow
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index 70551c4..12efa8a 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -73,6 +73,8 @@ enum { REGISTER_POLICY_MIXES, }; +#define MAX_ITEMS_PER_LIST 1024 + class BpAudioPolicyService : public BpInterface<IAudioPolicyService> { public: @@ -1054,10 +1056,18 @@ status_t BnAudioPolicyService::onTransact( audio_port_role_t role = (audio_port_role_t)data.readInt32(); audio_port_type_t type = (audio_port_type_t)data.readInt32(); unsigned int numPortsReq = data.readInt32(); + if (numPortsReq > MAX_ITEMS_PER_LIST) { + numPortsReq = MAX_ITEMS_PER_LIST; + } unsigned int numPorts = numPortsReq; - unsigned int generation; struct audio_port *ports = (struct audio_port *)calloc(numPortsReq, sizeof(struct audio_port)); + if (ports == NULL) { + reply->writeInt32(NO_MEMORY); + reply->writeInt32(0); + return NO_ERROR; + } + unsigned int generation; status_t status = listAudioPorts(role, type, &numPorts, ports, &generation); reply->writeInt32(status); reply->writeInt32(numPorts); @@ -1111,11 +1121,19 @@ status_t BnAudioPolicyService::onTransact( case LIST_AUDIO_PATCHES: { CHECK_INTERFACE(IAudioPolicyService, data, reply); unsigned int numPatchesReq = data.readInt32(); + if (numPatchesReq > MAX_ITEMS_PER_LIST) { + numPatchesReq = MAX_ITEMS_PER_LIST; + } unsigned int numPatches = numPatchesReq; - unsigned int generation; struct audio_patch *patches = (struct audio_patch *)calloc(numPatchesReq, sizeof(struct audio_patch)); + if (patches == NULL) { + reply->writeInt32(NO_MEMORY); + reply->writeInt32(0); + return NO_ERROR; + } + unsigned int generation; status_t status = listAudioPatches(&numPatches, patches, &generation); reply->writeInt32(status); reply->writeInt32(numPatches); |