diff options
author | Sanket Padawe <sanketpadawe@google.com> | 2017-08-10 04:39:33 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-10 04:39:33 +0000 |
commit | ddc6f6427e5bf38a91f06dc0c442db30803824af (patch) | |
tree | 3c910e3bb0e99b480456211d0b6febf1d159aecb | |
parent | 472cfd25eaefd4fa8384f8946be4dc20a15afd22 (diff) | |
parent | 957626f82d47ca9e76dc3fecf7ad91b4c31de09e (diff) | |
download | android_hardware_ril-ddc6f6427e5bf38a91f06dc0c442db30803824af.tar.gz android_hardware_ril-ddc6f6427e5bf38a91f06dc0c442db30803824af.tar.bz2 android_hardware_ril-ddc6f6427e5bf38a91f06dc0c442db30803824af.zip |
Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev am: e66a47c150
am: 957626f82d
Change-Id: Icf57631695a3fd622a939c05dc188901ad68db6f
-rw-r--r-- | libril/ril.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libril/ril.cpp b/libril/ril.cpp index 4424561..bb2aa7d 100644 --- a/libril/ril.cpp +++ b/libril/ril.cpp @@ -3990,12 +3990,12 @@ static void debugCallback (int fd, short flags, void *param) { int data; unsigned int qxdm_data[6]; const char *deactData[1] = {"1"}; - char *actData[1]; RIL_Dial dialData; int hangupData[1] = {1}; int number; char **args; RIL_SOCKET_ID socket_id = RIL_SOCKET_1; + int MAX_DIAL_ADDRESS = 128; int sim_id = 0; RLOGI("debugCallback for socket %s", rilSocketIdToString(socket_id)); @@ -4114,12 +4114,6 @@ static void debugCallback (int fd, short flags, void *param) { // Set network selection automatic. issueLocalRequest(RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, NULL, 0, socket_id); break; - case 6: - RLOGI("Debug port: Setup Data Call, Apn :%s\n", args[1]); - actData[0] = args[1]; - issueLocalRequest(RIL_REQUEST_SETUP_DATA_CALL, &actData, - sizeof(actData), socket_id); - break; case 7: RLOGI("Debug port: Deactivate Data Call"); issueLocalRequest(RIL_REQUEST_DEACTIVATE_DATA_CALL, &deactData, @@ -4128,6 +4122,12 @@ static void debugCallback (int fd, short flags, void *param) { case 8: RLOGI("Debug port: Dial Call"); dialData.clir = 0; + if (strlen(args[1]) > MAX_DIAL_ADDRESS) { + RLOGE("Debug port: Error calling Dial"); + freeDebugCallbackArgs(number, args); + close(acceptFD); + return; + } dialData.address = args[1]; issueLocalRequest(RIL_REQUEST_DIAL, &dialData, sizeof(dialData), socket_id); break; |