filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
458 Commits 1 Branch 0 Tags
b7f93e6f1082d4acd00a9cbe55ec8ebccdf4f8dd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Taylor 467361dbcf 37742976 - Catch bad gifs 
* A security researcher crafted a gif that would cause the Android
Bitmap code to throw an NPE. That would cause messaging to crash when
decoding the NPE. The frameworks team is changing the underlying code to
throw an OutOfMemoryError instead of a NullPointerException.
In order to catch both errors, the code needs to catch Throwable.

Test: I added code to GifImageResource.getDrawable to throw a new
OutOfMemoryError and then used the debugger to verify it was caught by the
new catch Throwable statement. I did the same test with NullPointerException.
I tested attaching gif images and sending them to verify the gif path still
worked.

BUG=37742976

Change-Id: If71a7e65f8c0b083fe6c4b79f78358666338d59d
 2017-10-05 11:27:21 -07:00
Tom Taylor b2dd6a8ef5 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 3f22a4820c 
am: 443a8888f2

Change-Id: I85c47a8571a609321e2c3e0dd4f2a2b57015e839
 2017-07-12 19:33:47 +00:00
Tom Taylor 9a643d5c1c 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 am: 7ace2d5308 
am: cb822ae902

Change-Id: I0b28ce9619853b280cd93af783b93d6aff92bc4f
 2017-07-12 19:33:39 +00:00
Tom Taylor 443a8888f2 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 
am: 3f22a4820c

Change-Id: I3007cf14803262bbb6f28db602b16252ebc4a62c
 2017-07-12 19:29:21 +00:00
Tom Taylor cb822ae902 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f am: c12af8d012 
am: 7ace2d5308

Change-Id: I1872889b944cdffa63bafd7a125315d2fe2d7917
 2017-07-12 19:28:15 +00:00
Tom Taylor 7ace2d5308 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f 
am: c12af8d012

Change-Id: I70465c2290a2ba08d7647acab20bdfb25e8b3ecd
 2017-07-12 19:24:50 +00:00
Tom Taylor 3f22a4820c 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f 
am: c12af8d012

Change-Id: I5c9fd14d532b95caaceb8ca8b5e70feee77c34a0
 2017-07-12 19:24:29 +00:00
Tom Taylor c12af8d012 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b 
am: f9b9dc3d2f

Change-Id: Ica8bedeb18ee6604e1382f54f0ad910b7cfa8c40
 2017-07-12 19:20:09 +00:00
Tom Taylor f9b9dc3d2f 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 
am: cbed68f73b

Change-Id: I66781d5390231f55da0ead3293010a240c632ff8
 2017-07-12 19:15:11 +00:00
Tom Taylor cbed68f73b 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 
am: 93d52cb5e2

Change-Id: I35c5b7ee69984e1c91c63c9cf78af9d1c0e0ab43
 2017-07-12 19:12:40 +00:00
Tom Taylor 93d52cb5e2 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 
am: a072033ce4

Change-Id: I2ead912804b75f6633d04259e0bdd61f2b4aad5f
 2017-07-12 19:11:39 +00:00
Tom Taylor a072033ce4 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 
am: 6ea30b87b1

Change-Id: I28cfc0b9abbc28420feec7c690406ebe922b31e8
 2017-07-12 19:09:10 +00:00
Tom Taylor 6ea30b87b1 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 
am: 7a6b99a4a4

Change-Id: I0817d9c8e4e30630cd0008f93ee31a728342eae1
 2017-07-12 19:07:09 +00:00
Tom Taylor 7a6b99a4a4 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec 
am: 22bbfd7360

Change-Id: Ibe13d61b03cc6ae40d6782bf7ae045b5aeb491de
 2017-07-12 19:06:10 +00:00
Tom Taylor 22bbfd7360 37742976 - Catch bad gifs am: e0f247e399 
am: 7c28ca34ec

Change-Id: I0dad7e115a279290a51ee652dbd6a4f9b7ab7081
 2017-07-12 19:02:38 +00:00
Tom Taylor 7c28ca34ec 37742976 - Catch bad gifs 
am: e0f247e399

Change-Id: I54307fd0a08e1ecc14b2f3be5b8d52fac6ff7033
 2017-07-12 19:01:08 +00:00
Tom Taylor e0f247e399 37742976 - Catch bad gifs 
* A security researcher crafted a gif that would cause the Android
Bitmap code to throw an NPE. That would cause messaging to crash when
decoding the NPE. Catch the NPE.

Test: manually tested the "crash.gif" attached to the bug. Stepped
through the debugger to verify we're catching the NPE and logging
the attempt. Verified normal gifs still work.

Bug: 37742976

Change-Id: Iab814d5b0b514bed0cecddd9a76f1fc095f90892
(cherry picked from commit 3671fd94ae)
 2017-06-23 16:48:57 -07:00
Tom Taylor 3671fd94ae 37742976 - Catch bad gifs 
* A security researcher crafted a gif that would cause the Android
Bitmap code to throw an NPE. That would cause messaging to crash when
decoding the NPE. Catch the NPE.

Test: manually tested the "crash.gif" attached to the bug. Stepped
through the debugger to verify we're catching the NPE and logging
the attempt. Verified normal gifs still work.

BUG=37742976

Change-Id: Iab814d5b0b514bed0cecddd9a76f1fc095f90892
 2017-06-23 14:09:12 -07:00
Tom Taylor 33e6be1db8 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev am: 7ffdc9c333 
am: a25e716645

Change-Id: I8f77c67dfc3002b2b6d5e20049e0cf715f6ff81e
 2017-05-01 18:29:30 +00:00
Tom Taylor a25e716645 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev 
am: 7ffdc9c333

Change-Id: Ibfe8a044ae6dd12fbd4c204150fa410fa6867220
 2017-05-01 18:21:56 +00:00
Tom Taylor 7ffdc9c333 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev 2017-05-01 18:09:08 +00:00
Tom Taylor db45a19fe5 37544704 PduPersister is not doing a safe Uri comparison 
* The PduPersister had some code where it checked uris for
equality, but didn't use the safe .equals method.

Test: manual test of sending and receiving mms's.

Bug: 37544704

Change-Id: I6dfd037068b4eff04c34cd9d41760e36e11915d6
 2017-05-01 09:21:52 -07:00
Tom Taylor e0f37bb8e1 22851197 Messaging Application crash with unsupported type's URI 
This bug and AOSP patch arrived last July. Supposedly, I
merged the change, but it's certainly not fixed in bugler, nor in various
copies of PduPersister in Android's master. Fixing all the locations
now.

Test: manual - sent/received MMS's to verify the change didn't break
existing behavior.

Bug: 22851197
Change-Id: Ia79bd9951b1820ebc42baf0eef38667753d77ab9
 2017-02-23 10:41:40 -08:00
Tom Taylor 5d2ab59dcd 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 am: 984688e992 
am: 103c8bdb63

Change-Id: I693dd05d0ce05117dc249bc6dac412a86800b528
 2017-01-17 20:11:26 +00:00
Tom Taylor 8ff9c6abce 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 am: 8495e582a1 
am: 8bace8dbea

Change-Id: I526b39e57f55282c77c74e26f61fd06211303c69
 2017-01-17 20:11:18 +00:00
Tom Taylor 103c8bdb63 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 
am: 984688e992

Change-Id: I5232bd8c0db4c17084a4c108f2c4aed4f1ceffdd
 2017-01-17 20:05:11 +00:00
Tom Taylor 8bace8dbea 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf am: eece1bd759 
am: 8495e582a1

Change-Id: I92091dcb75ea3289cb875d27bc8fa28c3028c33b
 2017-01-17 20:02:06 +00:00
Tom Taylor 8495e582a1 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf 
am: eece1bd759

Change-Id: I5b978323dc12e67a3ea2b27a71d1bf1de27e1c0a
 2017-01-17 19:59:54 +00:00
Tom Taylor 984688e992 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c am: fb324f89bf 
am: eece1bd759

Change-Id: Ib27dbe626b08898bc88063292a8b7750ffa39f9d
 2017-01-17 19:59:54 +00:00
Tom Taylor eece1bd759 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e am: 657379f51c 
am: fb324f89bf

Change-Id: I8e57243cac35d74a28e5af1fd23800d5cb7cb080
 2017-01-17 19:57:24 +00:00
Tom Taylor fb324f89bf 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a am: cc649e4e1e 
am: 657379f51c

Change-Id: I1533f159aa2ae92a6db094722475d2d5f527bb6d
 2017-01-17 19:55:43 +00:00
Tom Taylor 657379f51c 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 am: 82fa311e9a 
am: cc649e4e1e

Change-Id: Ibd12cb39d3abb95bacdfd0461927f5bd57b0c2c4
 2017-01-17 19:53:24 +00:00
Tom Taylor cc649e4e1e 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb am: 71d4913462 
am: 82fa311e9a

Change-Id: Ifd7c99312f526e379268f5f12a5ff61d95a90996
 2017-01-17 19:51:36 +00:00
Tom Taylor 82fa311e9a 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a am: 9f00add2fb 
am: 71d4913462

Change-Id: I114e41f77d0b7e07a2cf404a1d382451f7d6542f
 2017-01-17 19:49:23 +00:00
Tom Taylor 71d4913462 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] am: 6f763fef7a 
am: 9f00add2fb

Change-Id: If555818f7f14dcfef35c57c1d3e918ac0f31959a
 2017-01-17 19:46:53 +00:00
Tom Taylor 9f00add2fb 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so in colorMap->Colors[colorIndex] 
am: 6f763fef7a

Change-Id: Ia34564714e00734976099b95594b6ea6501894b9
 2017-01-17 19:44:53 +00:00
Tom Taylor 6f763fef7a 32764144 Security Vulnerability - heap buffer overflow in libgiftranscode.so 
in colorMap->Colors[colorIndex]

* No range checking was done on a color index. Add range
checking and bail if the color index is out of range.

Test: tested sending a large gif that would invoke the GifTranscoder library
to make the gif smaller.

Bug: 32764144
Change-Id: I44f36274ec333ae1960fa8fc96b2dbde35fbaa66
 2017-01-13 14:47:35 -08:00
Tom Taylor 6c7fecc71a 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 am: f07dfd0a19 
am: c40e95726f

Change-Id: I0c24254c09149ef14159e5d4b819167fd645eff8
 2017-01-06 18:17:48 +00:00
Tom Taylor d46ee4aa4f 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 am: 2686c894a4 
am: 61c16108ac

Change-Id: Ief7241e44856ee070b0c381e3d1baf5eaa3f6137
 2017-01-06 18:17:38 +00:00
Tom Taylor c40e95726f 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 
am: f07dfd0a19

Change-Id: Ib73874d5bd63ab5f43f79de4aff95f107ee00498
 2017-01-06 18:12:25 +00:00
Tom Taylor 61c16108ac 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 am: 0d9e6a3cf5 
am: 2686c894a4

Change-Id: I22c04edf76099b82e2e0d11211a4dfa031d641f1
 2017-01-06 18:11:46 +00:00
Tom Taylor f07dfd0a19 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 
am: 0d9e6a3cf5

Change-Id: Ib0b070a83020dcddf935e2b1de48cffc5665c986
 2017-01-06 18:07:43 +00:00
Tom Taylor 2686c894a4 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 am: 728c4943e9 
am: 0d9e6a3cf5

Change-Id: I39f21154f9c40a4d4f2da0467ad46170a43502e6
 2017-01-06 18:07:39 +00:00
Tom Taylor 0d9e6a3cf5 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 am: 508f541438 
am: 728c4943e9

Change-Id: I9cca57ea1b2e1ab554feec399c6697e14b258a3c
 2017-01-06 18:03:43 +00:00
Tom Taylor 728c4943e9 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 am: 2917015529 
am: 508f541438

Change-Id: I9a59d60847e30a476b187d928cb591cb4b2ac272
 2017-01-06 17:59:14 +00:00
Tom Taylor 508f541438 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 am: c708e8fb35 
am: 2917015529

Change-Id: I71a178ea92909fe11275ed5a051efca85ec7f6e2
 2017-01-06 17:56:08 +00:00
Tom Taylor 2917015529 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 am: cefccea7b4 
am: c708e8fb35

Change-Id: Iac2d9f2a4f11f4e0ec70c9aa9aeb8b105729ba7b
 2017-01-06 17:51:59 +00:00
Tom Taylor c708e8fb35 33388925 Mismatched new vs delete in framesequence library am: 837474a376 am: b44b56b779 
am: cefccea7b4

Change-Id: Ie7926325beb817a1894a4f966a9053e284258330
 2017-01-06 17:48:29 +00:00
Tom Taylor cefccea7b4 33388925 Mismatched new vs delete in framesequence library am: 837474a376 
am: b44b56b779

Change-Id: I18616dc9fff35bdfef460142dbf1b12a3f625a8e
 2017-01-06 17:45:00 +00:00
Tom Taylor b44b56b779 33388925 Mismatched new vs delete in framesequence library 
am: 837474a376

Change-Id: I1882a0ea4cb061fe39b2a26c7cd77534a609168c
 2017-01-06 17:41:33 +00:00
Tom Taylor 837474a376 33388925 Mismatched new vs delete in framesequence library 
* The array allocations neglected to include [] so delete, instead
of delete [] would get called.

* Test
Manual
- tested sending a large gif that would invoke the GifTranscoder library
to make the gif smaller.

Bug: 33388925
Change-Id: I1e200e470d66ae615ffe9340ff9c049eaa73f63c
 2017-01-04 09:42:37 -08:00
Tom Taylor 9124acfb8f Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 208a2979d4" into nyc-mr2-dev-plus-aosp 
am: aba491e150

Change-Id: Iefe48593ea99b2d73e8ca2500e77f2ccc82b9b36
 2016-12-07 03:06:40 +00:00
Tom Taylor cebf2d2fed Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 208a2979d4 
am: 6866222775

Change-Id: I9257577181cb175e670dbdd319ff3ffa3a239597
 2016-12-07 03:06:39 +00:00
Tom Taylor 07ac300933 Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 904b5cbec5" into nyc-mr2-dev-plus-aosp 
am: ab3d4505b8

Change-Id: I72ff3ae7db523a1ea15f14809023d05303c9de0e
 2016-12-07 03:06:22 +00:00
Tom Taylor 30c4aa86d7 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 904b5cbec5 
am: c1acc768f6

Change-Id: I6dcdf216d98de94cdd72a15c130b89ef38a9b58f
 2016-12-07 03:06:21 +00:00
Tom Taylor 959501b7a8 Merge "resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e" into nyc-mr2-dev-plus-aosp 
am: 6f1cbaf08f

Change-Id: I1026fe6d52c9f91dd31701659237f78e65ee41f5
 2016-12-07 03:06:05 +00:00
Tom Taylor 611d8f76df resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e 
am: c2faf5d56b

Change-Id: I156be7aede0a1647d73cac3ef79c02c209085969
 2016-12-07 03:06:04 +00:00
Tom Taylor 2e21662e13 resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 0c37f58fa0 
am: d918dfbcd7

Change-Id: Ica18f2cbe878d9c7ba111a2678610eeb47a688ac
 2016-12-07 03:05:55 +00:00
Tom Taylor 6866222775 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e 
am: 208a2979d4

Change-Id: I8a09f9dcd0f0fbfe933d55f6764eb831bf8431e7
 2016-12-07 03:02:03 +00:00
Tom Taylor c1acc768f6 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e 
am: 904b5cbec5

Change-Id: I441e0f4c3f7649796e5d67dc4d14f3a735399be2
 2016-12-07 03:02:03 +00:00
Tom Taylor c2faf5d56b resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f 
am: 713068d06e

Change-Id: I8a384b612c72a97c7dfa2bf195df8cd8c6858c32
 2016-12-07 03:01:55 +00:00
Tom Taylor d918dfbcd7 resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f 
am: 0c37f58fa0

Change-Id: I3b4cd7a04524f500030941b24edcaf2ecabee70d
 2016-12-07 03:01:55 +00:00
Tom Taylor 904b5cbec5 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 
am: 4d1366300e

Change-Id: Ieb82c45b1a09c9a8f3cb97ecc7f891971d19f09d
 2016-12-07 02:58:04 +00:00
Tom Taylor 208a2979d4 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 
am: 4d1366300e

Change-Id: I43080b80b2379787db69156555612fbee3eb0dbf
 2016-12-07 02:58:02 +00:00
Tom Taylor 713068d06e resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee 
am: 838049884f

Change-Id: I301dc30acd2a8647fbc8608f09e41500e6d673dd
 2016-12-07 02:57:54 +00:00
Tom Taylor 0c37f58fa0 resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee 
am: 838049884f

Change-Id: I54b2fc3ed0958a928a75575ba111374aa3c5a69c
 2016-12-07 02:57:54 +00:00
Tom Taylor 4d1366300e Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 
am: 28c5e61eb5

Change-Id: If6822da7a5eb2d5bb59fd6c31d01c47770e07d7d
 2016-12-07 02:54:04 +00:00
Tom Taylor 838049884f resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 
am: 47feeee8ee

Change-Id: Iec5af613a115c5120bbfd3e99d6e3503d0a05b36
 2016-12-07 02:53:54 +00:00
Tom Taylor 28c5e61eb5 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb 
am: 8166028e03

Change-Id: I2be10933c2b692efd21ad911375232029e5e18fa
 2016-12-07 02:49:34 +00:00
Tom Taylor 47feeee8ee resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 
am: 4d220d4777

Change-Id: I15daa15adbcd98ac51bdc1d1cf2a344c3638207c
 2016-12-07 02:49:24 +00:00
Tom Taylor 8166028e03 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c 
am: 518c9798eb

Change-Id: I773eb76c12d3c3adf1860cc17c1b09ed56b77e2d
 2016-12-07 02:46:00 +00:00
Tom Taylor 4d220d4777 resolve merge conflicts of eafd58a to nyc-dev 
am: a43c5c5f18

Change-Id: Ibcf2308553a68a8deaa05d15548d3eca67d4579a
 2016-12-07 02:45:53 +00:00
Tom Taylor 518c9798eb Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 
am: ced2069d1c

Change-Id: I9ddf0377ce1eff5620104cd0a43bb2eba310e469
 2016-12-07 02:41:54 +00:00
Tom Taylor a43c5c5f18 resolve merge conflicts of eafd58a to nyc-dev 
Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962
 2016-12-06 16:26:14 -08:00
Tom Taylor 44a2425fa2 Merge "32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 am: 55ebb66b11" into nyc-mr2-dev-plus-aosp 
am: 756f34d472

Change-Id: I9adc06844dac348c0dbaf31675387731296a47c1
 2016-12-06 22:46:47 +00:00
Tom Taylor 341bf114de 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 am: 55ebb66b11 
am: 8588963d8a

Change-Id: I998b3fd25c3e671af84d4fe68aca1e0e51822ecb
 2016-12-06 22:46:46 +00:00
Tom Taylor 2ada4e4707 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 am: a9bec8503b 
am: 6d7bb21c8a

Change-Id: Icfb261f102d7403c85bae2073e8c6d9eff437a55
 2016-12-06 22:46:39 +00:00
Tom Taylor 8588963d8a 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 
am: 55ebb66b11

Change-Id: I2bc2a0b5cf516caf7d4458e143eeaab75d9b370a
 2016-12-06 22:43:08 +00:00
Tom Taylor 6d7bb21c8a 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 
am: a9bec8503b

Change-Id: Iecfaa9939f7ae7651a8fd8b1ba1a256e0945245c
 2016-12-06 22:43:08 +00:00
Tom Taylor 55ebb66b11 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 
am: 49b092f602

Change-Id: Ic6ff3c928a97093885a9d227fac277964cba7f68
 2016-12-06 22:39:38 +00:00
Tom Taylor a9bec8503b 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 
am: 49b092f602

Change-Id: Ibab72017d2b4f54a77b8ff4030587a05e29b43b8
 2016-12-06 22:39:38 +00:00
Tom Taylor 49b092f602 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da 
am: 615f6d0b17

Change-Id: Ife414d257770570e7ea1d24e86b72e4efc3b8a56
 2016-12-06 22:36:08 +00:00
Tom Taylor 615f6d0b17 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 
am: 4dfcff98da

Change-Id: I0e6378adbd3c2d0b518cfe9f81e6c91abb6b85d4
 2016-12-06 22:31:37 +00:00
Tom Taylor 4dfcff98da 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef 
am: 313284eee7

Change-Id: Iaa18124b7f9090efe55a0a46a1851ff5c0b6fe28
 2016-12-06 22:27:37 +00:00
Tom Taylor 313284eee7 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 
am: 2397f2fbef

Change-Id: I16b590f76c9856d1407b336973ba86ff681415c6
 2016-12-06 22:24:07 +00:00
Tom Taylor ced2069d1c Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c 
am: 5cfdea9be6

Change-Id: I1a1351fb195c7d35efc5ca343b966da78e49b71f
 2016-12-06 22:20:25 +00:00
Tom Taylor eafd58a112 32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging am: 69ed579fb8 am: 10dccb12ad 
am: a21b8f936e

Change-Id: I5198e8db836d97da6aa05e56958a667af9388076
 2016-12-06 22:20:14 +00:00
Tom Taylor 2397f2fbef 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d 
am: 305a004e19

Change-Id: I85b2da9eee3e18db7512ee4b4658f696ea619746
 2016-12-06 22:20:07 +00:00
Tom Taylor 5cfdea9be6 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 
am: 091876853c

Change-Id: Icd96de516d5b9512e6f26c7f66f4be7579eb8212
 2016-12-06 22:16:51 +00:00
Tom Taylor a21b8f936e 32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging am: 69ed579fb8 
am: 10dccb12ad

Change-Id: Ia9830002762794a35da40daf8cc19f62434fabba
 2016-12-06 22:16:44 +00:00
Tom Taylor 305a004e19 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a 
am: 90bf70396d

Change-Id: I83792b4135c1e7adaf30f5835742fd1898b1b451
 2016-12-06 22:16:36 +00:00
Tom Taylor 091876853c Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev 
am: 3f6e2e2b07

Change-Id: I7778bcf83bde4fc352f247984e98d77af1e678f1
 2016-12-06 22:13:15 +00:00
Tom Taylor 10dccb12ad 32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging 
am: 69ed579fb8

Change-Id: I4be088ae899c6729da2197a9ab23951dc95c238e
 2016-12-06 22:13:14 +00:00
Tom Taylor 90bf70396d 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. 
am: a2aa53f83a

Change-Id: I65590775f92c296b490cdc0fa30815a7f69e1e38
 2016-12-06 22:13:07 +00:00
Tom Taylor 3f6e2e2b07 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev 2016-12-06 22:11:03 +00:00
Tom Taylor a2aa53f83a 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can 
attach private files from "/data/data/com.android.messaging/"
directory to the messaging app.

* This is a manual merge from ag/871758 -- backporting a security fix from
Bugle to Kazoo.
* Don't export the MediaScratchFileProvider or the MmsFileProvider. This
will block external access from third party apps. In addition, make both
providers more robust in handling path names. Make sure the file paths
handled in the providers point to the expected directory.

Change-Id: I9e6b3ae0e122e3f5022243418f2893d4a0859edb
Fixes: 32807795
 2016-12-05 16:39:55 -08:00
Tom Taylor 33c7742dc0 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d am: a1562e5ab6 am: d65f900883 am: 8307b0a020 am: 88b877fa20 
am: 8c9f230437

Change-Id: I82eeb2768d976ec379c20ea45227953713ad0094
 2016-12-05 23:26:32 +00:00
Tom Taylor 892afb52dc 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d am: a1562e5ab6 am: d65f900883 am: 8307b0a020 am: 255c296b3b 
am: f1a101e8f4

Change-Id: I5d3a11fc472be68c342705fd297fd4e2c9f7a84b
 2016-12-05 23:26:23 +00:00
Tom Taylor 8c9f230437 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d am: a1562e5ab6 am: d65f900883 am: 8307b0a020 
am: 88b877fa20

Change-Id: I8ad9f849c9f2680c69154118a7afc370d90d7fd7
 2016-12-05 23:21:30 +00:00
Tom Taylor f1a101e8f4 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d am: a1562e5ab6 am: d65f900883 am: 8307b0a020 
am: 255c296b3b

Change-Id: I321762fc1c913af3dfa172c60431f8f4ab4a8df2
 2016-12-05 23:21:20 +00:00