OSDN Git Service
Sudheer Shanka [Mon, 19 Sep 2016 22:45:40 +0000 (22:45 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am:
900550de49
am:
94da8023d5
Change-Id: Iedc174184adc89009ce498558a496b72d1c31a05
Sudheer Shanka [Mon, 19 Sep 2016 22:35:55 +0000 (22:35 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
e8340a9ed5
am:
5c53e1b8bb
Change-Id: Icd67597290378b8b62328cbfafa35fd0fc0497b6
Sudheer Shanka [Mon, 19 Sep 2016 20:47:39 +0000 (20:47 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
am:
900550de49
Change-Id: I16a545056d2fc3404164a1b63ef79165f46e54f1
Sudheer Shanka [Mon, 19 Sep 2016 20:47:35 +0000 (20:47 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
am:
e8340a9ed5
Change-Id: I52277ddde0b68b3be1764f325d04601e48a1cb1e
Sudheer Shanka [Mon, 19 Sep 2016 19:59:14 +0000 (19:59 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
Paul Jensen [Mon, 19 Sep 2016 14:43:28 +0000 (14:43 +0000)]
Fix build break due to automerge of
7d2198b5 am:
baae57ab24
am:
009e08116f
Change-Id: Ied1bf21ec09d9774bd0f12d2688244fe7dc2bd80
Paul Jensen [Mon, 19 Sep 2016 14:37:29 +0000 (14:37 +0000)]
Fix build break due to automerge of
7d2198b5
am:
baae57ab24
Change-Id: Iafcc207308b94d37a04d196def0e7c7a5ce037d9
Paul Jensen [Mon, 19 Sep 2016 12:53:20 +0000 (08:53 -0400)]
Fix build break due to automerge of
7d2198b5
Bug:
30100884
Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f
Paul Jensen [Mon, 19 Sep 2016 11:55:30 +0000 (11:55 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb am:
849f1ba2d9
am:
b7ba9fd70f
Change-Id: If57722c1437bd5ea7b3a1fd016cbc7fce8237965
Paul Jensen [Mon, 19 Sep 2016 11:50:42 +0000 (11:50 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9 am:
d37eb76465
am:
ddce8664bd
Change-Id: I9379db3398f066841fdb5435d8128e2d12bff63b
Paul Jensen [Mon, 19 Sep 2016 11:50:23 +0000 (11:50 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947 am:
3532f10fcb
am:
849f1ba2d9
Change-Id: I3213d64cc5396a22096e3ad484a3f769f03f6cda
Paul Jensen [Mon, 19 Sep 2016 11:44:22 +0000 (11:44 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7 am:
66ee2296a9
am:
d37eb76465
Change-Id: I2433d723fd9ec13774eff4aa40a089e73932f357
Paul Jensen [Mon, 19 Sep 2016 11:40:02 +0000 (11:40 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc am:
963ca6f947
am:
3532f10fcb
Change-Id: I9dc833de510da32d47c4e6b0a78eae4cc7a38832
Paul Jensen [Mon, 19 Sep 2016 11:37:54 +0000 (11:37 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273 am:
6634e90ad7
am:
66ee2296a9
Change-Id: Ib0023b44e521b936ab2f9450ad367b1feda64492
Paul Jensen [Mon, 19 Sep 2016 11:34:00 +0000 (11:34 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b am:
7c08c4d5cc
am:
963ca6f947
Change-Id: I1a509c39640e7f9d76bd2e420764aeb3d823a3df
Paul Jensen [Mon, 19 Sep 2016 11:31:54 +0000 (11:31 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586 am:
9c1cb7a273
am:
6634e90ad7
Change-Id: Id46b32b80d47f6b7e2bfab2740978377a6b711cf
Paul Jensen [Mon, 19 Sep 2016 11:27:47 +0000 (11:27 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am:
96c045807b
am:
7c08c4d5cc
Change-Id: Idd0a3598ffac808a39703a23238b47a02bca66ed
Paul Jensen [Mon, 19 Sep 2016 11:25:21 +0000 (11:25 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big am:
7d2198b586
am:
9c1cb7a273
Change-Id: I8cd4b0d33da22bc29abd176672659c3eeb8c7d5b
Paul Jensen [Mon, 19 Sep 2016 11:19:16 +0000 (11:19 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev
am:
96c045807b
Change-Id: Ia20ba679f7b0445567b43aa74eef27f751453d4e
Paul Jensen [Mon, 19 Sep 2016 11:19:13 +0000 (11:19 +0000)]
Avoid crashing when downloading MitM'd PAC that is too big
am:
7d2198b586
Change-Id: I512d6f9de6a92dd3cabec93bcadf437f5cf2e16d
Paul Jensen [Mon, 19 Sep 2016 11:10:59 +0000 (11:10 +0000)]
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:18:57 +0000 (13:18 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours am:
94537b171c
am:
9bb068a5ad
Change-Id: I0e4ea875ea14217e98ed5df3642046ce8d3db52a
Tadashi G. Takaoka [Sun, 18 Sep 2016 13:03:08 +0000 (13:03 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours am:
2578264b86 -s ours
am:
94537b171c
Change-Id: I382b954e67faa6ebf662349a763aafe8704ae711
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:47:22 +0000 (12:47 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e am:
29f2e1d93a -s ours
am:
2578264b86 -s ours
Change-Id: I0f5483480d7ba6c5a5386635fabc0db0bb5aefdb
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:23:36 +0000 (12:23 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours am:
233e3b22f9
am:
c296565749
Change-Id: I3b97c7b101c53c77f03c889d945d4630edebee44
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:22:55 +0000 (12:22 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1 am:
57454cf15e
am:
29f2e1d93a -s ours
Change-Id: Iaed8d1cc6e6a6bf00a9602ebb829d008f8c4e56e
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:21:41 +0000 (12:21 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours am:
076f262197
am:
3b06511a95
Change-Id: Ia01e63fcf975c21136c0b0206ecd413ec3d975ad
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:17:17 +0000 (12:17 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
f71d2cddf1
am:
57454cf15e
Change-Id: I2620580fca624c6ab4520f0a31c42cef42bafa01
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:12:22 +0000 (12:12 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev am:
8fa8da727b
am:
9ef783599b
Change-Id: Idd8e19b941e01ff2de557c569bb06dc0a7bbb6d1
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:12:15 +0000 (12:12 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev am:
5fa097311c -s ours
am:
233e3b22f9
Change-Id: Iec8b29d93df5e23d80fe9c48f102a6c8d5b4daba
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:10:22 +0000 (12:10 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
43f4980e77
am:
cd8595cdcf
Change-Id: I27939b464cc8e57a7eba7e03af0f4601fb777ec3
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:10:03 +0000 (12:10 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data am:
c6fc6c3b55 -s ours
am:
076f262197
Change-Id: Idcd2180c908fb20bfd861c74e07c45c7b2cffed5
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:06 +0000 (12:04 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev
am:
5fa097311c -s ours
Change-Id: I4c06dd7ff10cafcf15d0e4ece474c97343f608ae
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:03 +0000 (12:04 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
c6fc6c3b55 -s ours
Change-Id: I1433140b2805ca127956f210a3faa81f83dd3069
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:04:01 +0000 (12:04 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev
am:
8fa8da727b
Change-Id: Ic46e534eebdba8def4e32318aee04601179fc7a9
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:03:59 +0000 (12:03 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
f71d2cddf1
Change-Id: Iaa5041d4b5fc61860f7ce95ecce60d39bbd5023b
Tadashi G. Takaoka [Sun, 18 Sep 2016 12:03:58 +0000 (12:03 +0000)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
am:
43f4980e77
Change-Id: Ibbf09fdbcaf00fd41d832e3e2597978e2a0863a9
Tadashi G. Takaoka [Sun, 18 Sep 2016 11:55:55 +0000 (11:55 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-mr1-dev
Tadashi G. Takaoka [Sun, 18 Sep 2016 11:55:33 +0000 (11:55 +0000)]
Merge "DO NOT MERGE: Catch all exceptions when parsing IME meta data" into lmp-dev
Jeff Sharkey [Fri, 16 Sep 2016 22:07:27 +0000 (22:07 +0000)]
Use "all_downloads" instead of "my_downloads". am:
1547194418 am:
f6d7c1ed15
am:
6db572cf00
Change-Id: I687a883d528cc260aad3ee3da5600d3e0542c940
Jeff Sharkey [Fri, 16 Sep 2016 21:53:37 +0000 (21:53 +0000)]
Use "all_downloads" instead of "my_downloads". am:
1547194418
am:
f6d7c1ed15
Change-Id: Icb352ec7b0e746264a6311b5fba1fc1272b627b0
Jeff Sharkey [Fri, 16 Sep 2016 21:48:24 +0000 (21:48 +0000)]
Use "all_downloads" instead of "my_downloads".
am:
1547194418
Change-Id: I6dabba1f82ef1989eb2a52c3c493127a174ff315
Jeff Sharkey [Fri, 16 Sep 2016 18:04:05 +0000 (12:04 -0600)]
Use "all_downloads" instead of "my_downloads".
We can no longer return the "my_downloads" paths: if those Uris were
shared beyond the app that requested the download, access would be
denied. Instead, we need to switch to using "all_downloads" Uris so
that permission grants can be issued to third-party viewer apps.
Since an app requesting a download doesn't normally have permission
to "all_downloads" paths, DownloadProvider now issues narrow grants
toward the owner of each download, both at device boot and when new
downloads are started.
Bug:
30537115,
30945409
Change-Id: I533125b36444877f54373d88922f2acc777e250b
Tadashi G. Takaoka [Fri, 16 Sep 2016 03:12:14 +0000 (12:12 +0900)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
Bug:
30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from
9b2997d22e6ce2a15065d8e7608dd77b316c2065)
Tadashi G. Takaoka [Fri, 16 Sep 2016 03:12:14 +0000 (12:12 +0900)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
Bug:
30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from
9b2997d22e6ce2a15065d8e7608dd77b316c2065)
Tadashi G. Takaoka [Fri, 16 Sep 2016 03:00:57 +0000 (12:00 +0900)]
DO NOT MERGE: Catch all exceptions when parsing IME meta data
Bug:
30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from
9b2997d22e6ce2a15065d8e7608dd77b316c2065)
Sudheer Shanka [Wed, 14 Sep 2016 21:37:14 +0000 (14:37 -0700)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
Don't hold mPidsSelfLocked lock when calling
cleanUpApplicationRecordLocked.
Bug:
31463143
Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98
Sungsoo [Fri, 9 Sep 2016 23:46:07 +0000 (23:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e
am:
40d3c1a7f0
Change-Id: I491d585b91c7d7b130bbfbcdd62aaddf57718c56
Sungsoo [Fri, 9 Sep 2016 23:37:52 +0000 (23:37 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours
am:
9f37a8900e
Change-Id: Ied9ac7711abaee4d1f534d35f7882f0a93c425bf
Sungsoo [Fri, 9 Sep 2016 23:08:29 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours
am:
f495cf6944 -s ours
Change-Id: If47c5a777ad3c7e4cca070ca633ec01442444c8e
Sungsoo [Fri, 9 Sep 2016 23:08:29 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0
am:
c17e29076e
Change-Id: If6e85c284a811287a9751eb501e50dabe2dfe8b1
Sungsoo [Fri, 9 Sep 2016 23:00:35 +0000 (23:00 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830
am:
d07324fe85 -s ours
Change-Id: Ie3049cea7663d06632b0e3139f30f01e7dba5df0
Sungsoo [Fri, 9 Sep 2016 23:00:21 +0000 (23:00 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours
am:
3af57850a0
Change-Id: I70f6b639cab68d401d3927c67192d3b89e08eee3
Sungsoo [Fri, 9 Sep 2016 22:54:32 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
aebe2347a7 -s ours
Change-Id: I58dd093cb10fd89e44d59867f5a4c1a378a61661
Sungsoo [Fri, 9 Sep 2016 22:54:28 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30
am:
8d3e6bd3ef
Change-Id: I83f7733039ee73407aa5d7f3848ad1074e9dfb03
Sungsoo [Fri, 9 Sep 2016 22:54:12 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953
am:
b336cce830
Change-Id: Ib90b72ce9abefc6a7ceab1070555ded45dc8567d
Sungsoo [Fri, 9 Sep 2016 22:46:44 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
659275dc30
Change-Id: I385c86e9753f1c99201a4f32b3c8b840da51376e
Sungsoo [Fri, 9 Sep 2016 22:46:23 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
1bdd10a953
Change-Id: I644f8187ed6f5957fc273b98c10ed0c602ed1879
Narayan Kamath [Fri, 9 Sep 2016 10:05:44 +0000 (10:05 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- change std::unordered_map to std::tr1::unordered_map.
- add /dev/alarm and /dev/__properties__ to the whitelist.
- map.erase(iterator) returns void prior to C++11, so need the kludge
of calling erase(it++).
(cherry picked from commit
7ec85f9d549971af59f047d5eafd7a829e1541c7)
Change-Id: If44dc64275d753553233b78a05d41df9d5bfdc36
Narayan Kamath [Wed, 7 Sep 2016 20:01:56 +0000 (20:01 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87
am:
9a409265fc -s ours
Change-Id: Idf4dcc5ab7e8b0510848cbd2f220fe7a8e4b3e04
Narayan Kamath [Wed, 7 Sep 2016 18:58:41 +0000 (18:58 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54
am:
f7b9f84f87
Change-Id: I317cecff389f30c5d47e4adee1afafbde8d9d23d
Narayan Kamath [Wed, 7 Sep 2016 18:53:40 +0000 (18:53 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
7ec85f9d54
Change-Id: I6db56b5b06636201382f6d908297644183253c0b
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- change std::unordered_map to std::tr1::unordered_map.
- add /dev/alarm and /dev/__properties__ to the whitelist.
- map.erase(iterator) returns void prior to C++11, so need the kludge
of calling erase(it++).
Change-Id: I694ff66d5f227239b0190ffc2287882b16e336fa
Paul Jensen [Mon, 22 Aug 2016 13:15:40 +0000 (09:15 -0400)]
Avoid crashing when downloading MitM'd PAC that is too big
There's two pieces to this fix:
1. Move PAC loading off IoThread which isn't meant for
blocking network fetches. If the fetch takes more than
60s Android reboots when the IoThread is used.
2. Limit PAC fetching to 20MB. Any PAC bigger than that
is likely evil.
MitM of PACs should only be possbile when a non-SSL PAC URL
is used.
Change-Id: Ie1658a1c705615dc85a7fc68053f0dad8d048294
Fixes:
30100884
Sudheer Shanka [Wed, 24 Aug 2016 20:38:40 +0000 (20:38 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944
am:
a0994c6d58
Change-Id: I50cb41c74c4d049390155fc0981f6609673febd0
Sudheer Shanka [Wed, 24 Aug 2016 20:38:30 +0000 (20:38 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours am:
f368bdee06
am:
f21534a288
Change-Id: I4e5a6b4eb30dde276a1293e986398a8dba21ef05
Amith Yamasani [Wed, 24 Aug 2016 20:38:20 +0000 (20:38 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986
am:
03b0f5c3ec
Change-Id: Ic8565bef0bbd034c4d54eff428731809b29ee0c3
Sudheer Shanka [Wed, 24 Aug 2016 20:38:16 +0000 (20:38 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7
am:
c8aedeeaf6
Change-Id: Id8f62a0c41004aa713d61a87f59e7ee1eff4ee0a
Amith Yamasani [Wed, 24 Aug 2016 20:38:12 +0000 (20:38 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
b02862c2cf
am:
dd0be992c0
Change-Id: I93958d0b8cf2d7a79af4ff534209848f3b0e35c2
Narayan Kamath [Wed, 24 Aug 2016 20:30:21 +0000 (20:30 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47 am:
efab128e67 am:
86437ec433
am:
4d7740907e
Change-Id: If0e46bb3e4fd182a46b714e0e9140deac8fc470e
Narayan Kamath [Wed, 24 Aug 2016 20:30:13 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours am:
2984748753 am:
b9fae65605
am:
c6c7ca0cde
Change-Id: Ifca9f825dac758c653560c41b81a13bd13c9fd4c
Narayan Kamath [Wed, 24 Aug 2016 20:30:09 +0000 (20:30 +0000)]
Process: Fix communication with zygote. am:
e29c6493c0 am:
1bd43c162f
am:
3c63bb367f
Change-Id: Iaa5ba9f3fcc28da14b60dc489e49bd177d2bfcb3
David Christie [Wed, 24 Aug 2016 20:30:06 +0000 (20:30 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug:
29555864 am:
dde12c6923 am:
3462e52676 am:
5a6b11114a am:
655361b2b1 am:
62783bde30
am:
8788a2413c
Change-Id: If9d5385d7d949e85932e5586d4884ffe84d51d47
David Christie [Wed, 24 Aug 2016 20:30:01 +0000 (20:30 +0000)]
resolve merge conflicts of
b4a5615 to lmp-dev am:
288166cbb2 am:
b7f8b59e24
am:
41a0dd41f1
Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801
David Christie [Tue, 23 Aug 2016 23:19:51 +0000 (16:19 -0700)]
resolve merge conflicts of
1081a15 to lmp-mr1-ub-dev
Change-Id: Ic44c577ef364bf81dd1e30b50c71718d4910eb10
Sudheer Shanka [Mon, 22 Aug 2016 22:38:23 +0000 (22:38 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207 am:
21ef672cab am:
e0d1ff1c42 -s ours am:
b31a6955a4 -s ours
am:
52d0f48f80
Change-Id: I01d36d2e160c3e33e3f2701843d768b5f581af1b
Sudheer Shanka [Mon, 22 Aug 2016 22:33:15 +0000 (22:33 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207 am:
21ef672cab am:
e0d1ff1c42 -s ours
am:
b31a6955a4 -s ours
Change-Id: I6fb134e75355bc1fdcc2dd9a21b51802575c28f3
Sudheer Shanka [Mon, 22 Aug 2016 22:33:10 +0000 (22:33 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9
am:
6a50270944
Change-Id: I55fa6f6719a4ce3358ca7ba9f0244fb4ada96368
Sudheer Shanka [Mon, 22 Aug 2016 22:28:24 +0000 (22:28 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours
am:
bbbb514bc9
Change-Id: I47bfb18ce300e52a092da534b8aac720f0b8aa3f
Sudheer Shanka [Mon, 22 Aug 2016 22:19:10 +0000 (22:19 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207 am:
21ef672cab
am:
e0d1ff1c42 -s ours
Change-Id: I8a1464443e84bb7987235d25ad40ae01386d72ef
Sudheer Shanka [Mon, 22 Aug 2016 22:19:06 +0000 (22:19 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev
am:
76c4b2a7b6 -s ours
Change-Id: Icdcd0929eb7bd32665e91fe2598af46db3ff01bd
Sudheer Shanka [Mon, 22 Aug 2016 22:11:52 +0000 (22:11 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a3af5c6207
am:
21ef672cab
Change-Id: Ia073a40c330038e77ff5992c056a8fe0a5924edb
Sudheer Shanka [Fri, 19 Aug 2016 18:27:31 +0000 (11:27 -0700)]
resolve merge conflicts of
270947f to klp-modular-dev
Change-Id: I703a7f8eb0897e518c3df9e8c7efa19508611a47
Sudheer Shanka [Fri, 19 Aug 2016 18:01:17 +0000 (18:01 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours
am:
f368bdee06
Change-Id: I56d187b0466e674e423754818ba51ca0cdd61a3c
Sudheer Shanka [Fri, 19 Aug 2016 17:46:12 +0000 (17:46 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev
am:
de04301f9a
Change-Id: I1d04889e2227d0a9a6b86b44ce38cdc5763dfac0
Sudheer Shanka [Fri, 19 Aug 2016 17:32:01 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
a3af5c6207
Change-Id: Ibdd69f2fa346dc31224fa6357718f56aa26ded1d
Amith Yamasani [Fri, 19 Aug 2016 17:31:47 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours
am:
9be12f8986
Change-Id: Ie692388b7c4ad6492444347ac128d8cf83dd9e21
Sudheer Shanka [Fri, 19 Aug 2016 17:31:43 +0000 (17:31 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev
am:
5e55214ab7
Change-Id: If6174229b0b6d378b7cf6c5f5618ce70d04c400b
Amith Yamasani [Fri, 19 Aug 2016 17:31:39 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
b02862c2cf
Change-Id: Id89010f4bf96a43ef9f97488353fbdf89c6f2931
Sudheer Shanka [Fri, 19 Aug 2016 17:11:30 +0000 (17:11 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev
am:
96052ea905 -s ours
Change-Id: I6d7353ed5154dfa3c6d556e4701c8c8e4f66feac
Amith Yamasani [Fri, 19 Aug 2016 17:11:28 +0000 (17:11 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
a92810a189 -s ours
Change-Id: Ic25323f818ee224640686c4e1d6c3b3f62ff828f
Sudheer Shanka [Fri, 19 Aug 2016 17:07:04 +0000 (17:07 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:58 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:56 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev
Narayan Kamath [Thu, 18 Aug 2016 10:30:00 +0000 (10:30 +0000)]
Merge "Process: Fix communication with zygote." into klp-dev am:
6829cf28e2 am:
8fdee85e87 am:
4cf5241f47 am:
efab128e67
am:
86437ec433
Change-Id: If18135c4aebd55fa9a1f08e275dbfef3dc433b5e
Narayan Kamath [Thu, 18 Aug 2016 10:29:55 +0000 (10:29 +0000)]
Process: Fix communication with zygote. am:
8e69dd2284 am:
b85e9e9108 am:
b56f4f53e1 -s ours am:
2984748753
am:
b9fae65605
Change-Id: I3df204c005d61091f83e6ee2bd6bcd2a63a68c2b