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
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
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
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
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
4d220d4777
resolve merge conflicts of eafd58a to nyc-dev
...
am: a43c5c5f18
Change-Id: Ibcf2308553a68a8deaa05d15548d3eca67d4579a
2016-12-07 02:45:53 +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
Android Build Merger (Role)
756f34d472
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
2016-12-06 22:43:14 +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
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
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
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
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
Tom Taylor
88b877fa20
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
Change-Id: Ia5a7611f20f4d1dd5274df69c13939a1a7905f55
2016-12-05 23:17:49 +00:00
Tom Taylor
255c296b3b
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
Change-Id: I49078962418e1970485f7af78ea8d78c25efad59
2016-12-05 23:17:49 +00:00
Tom Taylor
8307b0a020
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d am: a1562e5ab6
...
am: d65f900883
Change-Id: Ia2dc85f87d620c5ca6e28803ab7b62434e2eb74f
2016-12-05 23:13:48 +00:00
Tom Taylor
d65f900883
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d
...
am: a1562e5ab6
Change-Id: Icc21314c2194d15c22fa62dc1d59e6734ffd1108
2016-12-05 23:10:21 +00:00
Tom Taylor
a1562e5ab6
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b
...
am: a044afd70d
Change-Id: I1adf9711fa5e74f208693bc710e0060b04544b8d
2016-12-05 23:07:21 +00:00
Tom Taylor
a044afd70d
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44
...
am: e215495b3b
Change-Id: I41014416971669f09f0d43b1a548dc56ba570e4e
2016-12-05 23:03:11 +00:00
Tom Taylor
e215495b3b
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27
...
am: 954e81ed44
Change-Id: I33a015563c7ca0acc011de6e5b30d53d8ae1a7e8
2016-12-05 23:00:12 +00:00
Tom Taylor
954e81ed44
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715
...
am: 5311a02e27
Change-Id: I2afadd0fe76f451304f4aa6d7f6a9b0c35dfaf54
2016-12-05 22:57:11 +00:00
Tom Taylor
5311a02e27
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so
...
am: bcc1f62715
Change-Id: Ia790b66a2d7d26b53463ebb2ebae524a7b4155fc
2016-12-05 22:53:45 +00:00
Tom Taylor
69ed579fb8
32161610 Security Vulnerability - Information disclosure vulnerability
...
in AOSP Messaging
* Check to make sure the returned uri from the gallery picker does
not point to bugle's data directory (or any subdir).
* Test:
Manual-
* I created the test app in the bug, the one that injects the bad
uri into Bugle. I verified the bad behavior before the fix and the
good behavior after.
* I tested the gallery to make sure picking photos,
from the photos app and drive, still work.
* I verified the behavior in the debugger to be sure the code is
catching the bad uri from the test app.
Change-Id: I3393f3b886c837a49758b91945cf1e17ec9bee41
Fixes: 32161610
2016-12-05 13:57:45 -08:00
Tom Taylor
bcc1f62715
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so
...
* No range checking was done on the background color index. Add range
checking and bail if the color index is out of range.
* Test
Manual
- tested sending the gif attached in the bug.
- tested sending a 3.5mb gif to verify the gif transcoding was taking place.
- tested on arm64, arm, and x86 devices.
Change-Id: Id16ddccf05c8472ddebc1284b2a928dafd1be551
Fixes: 32322450
2016-12-01 12:20:44 -08:00
Tom Taylor
0bc4f2ff03
32322450 Security Vulnerability - heap buffer overflow in
...
libgiftranscode.so
* No range checking was done on the background color index.
Add range checking and bail if the color index is out of range.
Test: Manual
- tested sending the gif attached in the bug.
- tested sending a 3.5mb gif to verify the gif transcoding was
taking place.
- tested on arm64, arm, and x86 devices.
Change-Id: I0fd2141436e506a3dc2da04c8ede4701e2a57d19
2016-11-30 14:24:41 -08:00
Vineeta Srivastava
70e0cbfe48
Bell: enable WPAS am: 1156cd7408 am: 78048e375f am: 1ddff725f0
...
am: 9533787603
Change-Id: I542e7a3ae09d1ee3fea3c542503da2c1556a4f4d
2016-11-23 23:57:19 +00:00
Vineeta Srivastava
9533787603
Bell: enable WPAS am: 1156cd7408 am: 78048e375f
...
am: 1ddff725f0
Change-Id: Ia96420a941957f7dd68255553c4db5a1904a6422
2016-11-23 23:44:11 +00:00
Vineeta Srivastava
1ddff725f0
Bell: enable WPAS am: 1156cd7408
...
am: 78048e375f
Change-Id: Ia29596323b2d0e08c34fbef04f0bd6b7043db4df
2016-11-23 23:27:58 +00:00
Vineeta Srivastava
8b3b6ba04c
Bell: enable WPAS am: 1156cd7408 am: 78048e375f am: 60636bb71e
...
am: 2f3e38356f
Change-Id: Ieaf5cc67560a65c8ab6eaf86cb52f597a7eec844
2016-10-25 22:39:08 +00:00
Vineeta Srivastava
2f3e38356f
Bell: enable WPAS am: 1156cd7408 am: 78048e375f
...
am: 60636bb71e
Change-Id: Iac137abdbd7a5e581f88defeec80ff8340b16df4
2016-10-25 22:35:01 +00:00