Commit Graph

164883 Commits

Author SHA1 Message Date
Narayan Kamath
14bd75fa79 Zygote : Block SIGCHLD during fork. am: b1f1209d9a
am: 35b8453338

Change-Id: I7c73b1a37d79f31ad8fff6d0b83426debbfd88f9
2016-11-10 11:12:11 +00:00
Narayan Kamath
35b8453338 Zygote : Block SIGCHLD during fork.
am: b1f1209d9a

Change-Id: I3658f583c82dd6243089aaa74ad731a5bfa85b01
2016-11-10 11:05:42 +00:00
Narayan Kamath
b1f1209d9a Zygote : Block SIGCHLD during fork.
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.

To prevent this from happening, block SIGCHLD during this critical
section.

Bug: 32693692
Test: Manual

(cherry picked from commit e9a525829a)

Zygote: Unblock SIGCHLD in the parent after fork.

Follow up to change e9a525829a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.

Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug: 32693692
Test: manual

(cherry picked from commit 1480dc3e97)

Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
2016-11-10 10:06:01 +00:00
Narayan Kamath
846f64c6fc Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485
am: a045aed7a2

Change-Id: Iec015c0607286511a0d82db7fd6c82f6e17379aa
2016-11-09 20:17:01 +00:00
Narayan Kamath
e82866df3f Zygote: Additional whitelisting for legacy devices. am: 7d302e018d
am: f369b3ce75

Change-Id: Id0794434479585b2cf4b4996256a3cb9374fd9a7
2016-11-09 20:16:06 +00:00
Narayan Kamath
b0a7831375 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6
am: fd23b9d509

Change-Id: I86ad3b0fe5c3da67014540c1aa35c4326ee4f33b
2016-11-09 20:15:05 +00:00
Narayan Kamath
f0cd32619e Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6
am: 1e6a5d11a6

Change-Id: Ia98abb9cb437dd3c42b80de5c0cd98c965e6603e
2016-11-09 20:14:07 +00:00
neo.chae
85afb42c16 Fix idmap leak in zygote process am: 0244ca8d10
am: 82537abc3b

Change-Id: I83d338ebfdefd0f935c4cfb14c3b15efca1cce0f
2016-11-09 20:13:07 +00:00
Xin Li
34de2a2d45 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev
am: 78f15948fb

Change-Id: I5f5509cd98a6a98ce9edc782e9d8ef9093fa86e4
2016-11-09 20:11:44 +00:00
Xin Li
16090c6177 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev.
am: 7e0483fcec  -s ours

Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5
2016-11-09 20:11:40 +00:00
Narayan Kamath
a045aed7a2 Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev
am: 7bd25ab485

Change-Id: I0266e2fe129ac5ae0c7bbd84e7890d5c41872655
2016-11-09 10:24:57 +00:00
Narayan Kamath
f369b3ce75 Zygote: Additional whitelisting for legacy devices.
am: 7d302e018d

Change-Id: I15f8e0ec93f502ca45a9b00d93baa66780701996
2016-11-09 10:24:53 +00:00
Narayan Kamath
7bd25ab485 Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev 2016-11-09 10:20:04 +00:00
Narayan Kamath
fd23b9d509 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev
am: d60156dfc6

Change-Id: I3696ed3639492ae446ccd1c9ad4feaaa9e15a5ef
2016-11-09 09:39:23 +00:00
Narayan Kamath
1e6a5d11a6 Zygote: Additional whitelists for runtime overlay / other static resources.
am: 0ad0e859f6

Change-Id: Id24798deebb738ba6c6b6abef28ca96c0c61dc79
2016-11-09 09:39:20 +00:00
Narayan Kamath
d60156dfc6 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev 2016-11-09 09:30:50 +00:00
neo.chae
82537abc3b Fix idmap leak in zygote process
am: 0244ca8d10

Change-Id: Ia35ded23161ad5c5c6fe4dea388e74b8d8af2955
2016-11-09 09:21:46 +00:00
Xin Li
78f15948fb Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev 2016-11-08 21:24:17 +00:00
neo.chae
0244ca8d10 Fix idmap leak in zygote process
Fix a idmap leak in AssetManager::addSystemOverlays.
And, The fix could also prevent fd leak of idmap.

Test: none
Bug: 32691930

Signed-off-by: Hyangseok Chae <neo.chae@lge.com>

(cherry picked from commit 6a742a3850)

Change-Id: Idc4af77db2b0cb739bd6b009b6af0f9123be1aac
2016-11-08 09:59:44 +00:00
Narayan Kamath
7d302e018d Zygote: Additional whitelisting for legacy devices.
On M and below, we provide a blanket whitelist for all files under
"/vendor/zygote_whitelist". This path is whitelisted purely to allow
this patch to be applied easily on legacy devices and configurations.

Note that this does not amount to a loosening of our security policy
because whitelisted files are reopened anyway.

Bug: 32691930
Test: manual

(cherry picked from commit 5e2f7c6229)

Change-Id: I9700fc7b469d0bc4d876c52292f25888b94a5223
2016-11-08 09:42:11 +00:00
Narayan Kamath
0ad0e859f6 Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit 1c15c63578.

These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.

Bug: 32618130

Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
2016-11-08 09:41:49 +00:00
Sungsoo
583a7017ce DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184 -s ours am: 21c4e6d532 -s ours
am: ec44540d42

Change-Id: Id4fd3422c443d5e7363d3ff27b2ba0eeb532f1dd
2016-10-18 17:54:57 +00:00
Sungsoo
ec44540d42 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184 -s ours
am: 21c4e6d532  -s ours

Change-Id: Ibf02e62ee13accd5d204c44faeb6aa8c05afb709
2016-10-18 17:47:58 +00:00
Sungsoo
21c4e6d532 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e
am: 9a15881184  -s ours

Change-Id: I67ba2d8b8d3c3f32fca417303ee422482acc40d8
2016-10-18 17:41:55 +00:00
Sungsoo
9a15881184 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba
am: a5affb045e

Change-Id: I4bb4440c019839073b4fcf6df54d726a02286680
2016-10-18 17:35:23 +00:00
Sungsoo
8e2451759d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours
am: 02cd808ab8

Change-Id: Ic14a5adecb6fb0732a5b3c2a68a28fdcf1eb1bc4
2016-10-18 17:35:16 +00:00
Sungsoo
02cd808ab8 DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: 135524f2c5  -s ours

Change-Id: I34fc1b37171ad6ea5d79035df6c4730260a0b47b
2016-10-18 17:29:03 +00:00
Sungsoo
a5affb045e DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: 418e0869ba

Change-Id: Ifad08d681f67abc4dd9ad5d8c4e82b038cbd8322
2016-10-18 17:28:58 +00:00
Sungsoo
41b775b40a DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: ad74e88f1d

Change-Id: Ic8a6e5b579c028a560436cdc6c3ca68a51cbf229
2016-10-18 17:28:58 +00:00
Sungsoo
ad74e88f1d DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-18 16:18:35 +00:00
Sungsoo
135524f2c5 DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-18 16:18:15 +00:00
Sungsoo
418e0869ba DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-18 16:17:29 +00:00
Suprabh Shukla
6d7f209964 Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours am: 5bea7d3aee -s ours
am: 0eef6b3ff2

Change-Id: Ia5e16b194bb3af63506557c88ef2f5077dc58000
2016-10-15 01:10:15 +00:00
Suprabh Shukla
2432cf3645 DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78 -s ours am: 9c78d0ad9f -s ours
am: 7dfd05f0e5

Change-Id: Icfcde7dc91379a4e69d688501a0c46797b212103
2016-10-15 01:04:39 +00:00
Suprabh Shukla
0eef6b3ff2 Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours
am: 5bea7d3aee  -s ours

Change-Id: If66e50ff4d2f4c1b91ed3204d7a11000429489d5
2016-10-15 00:59:41 +00:00
Suprabh Shukla
7dfd05f0e5 DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78 -s ours
am: 9c78d0ad9f  -s ours

Change-Id: I6e82648a135bd8ae17337eb97518eb8856d065e0
2016-10-15 00:56:40 +00:00
Suprabh Shukla
5bea7d3aee Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a
am: e3c0c509ea  -s ours

Change-Id: I287e60913bd2a3f6b46d1d5ef2413727e3e63cc2
2016-10-15 00:49:46 +00:00
Suprabh Shukla
9c78d0ad9f DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0
am: e07b811d78  -s ours

Change-Id: Ia9271aeed1c2953a318fc4bf50ee169739147d66
2016-10-15 00:48:51 +00:00
Suprabh Shukla
e3c0c509ea Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280
am: c36913e68a

Change-Id: I65ab1551a4cdbbdf58bf9ec98f718e79c6ee9fe5
2016-10-15 00:41:36 +00:00
Suprabh Shukla
e07b811d78 DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861
am: 9df66924c0

Change-Id: I9bd2580a687037fe9c5d74765d47bb4500b4d096
2016-10-15 00:40:45 +00:00
Suprabh Shukla
0645127e25 Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0 -s ours
am: 40a13c5917

Change-Id: I15dbea28f9afc052060eb802340f745ad82a7281
2016-10-15 00:38:27 +00:00
Suprabh Shukla
56b525a313 DO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee70a2 -s ours
am: 8d124e37f1

Change-Id: I59ee9b64743d128b3d9262b38897e84b1ed64b56
2016-10-15 00:37:25 +00:00
Suprabh Shukla
c36913e68a Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev
am: 6739ba0280

Change-Id: Ib8534d2c7ae344d430a9ba2e227cb65d942f0222
2016-10-15 00:34:11 +00:00
Suprabh Shukla
9df66924c0 DO NOT MERGE Isolated processes don't get precached system service binders
am: 2aa7e5e861

Change-Id: Ied81e1f4b517627f0ced686e7485fa035b1f4c6a
2016-10-15 00:34:09 +00:00
Suprabh Shukla
40a13c5917 Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev
am: 35bd0fc5f0  -s ours

Change-Id: I852b990d1715782f3332d56bba6f08b72da403c6
2016-10-15 00:34:06 +00:00
Suprabh Shukla
8d124e37f1 DO NOT MERGE Isolated processes don't get precached system service binders
am: 4779ee70a2  -s ours

Change-Id: Ie4aef1642ca6f23d78e732f27455ebd087866121
2016-10-15 00:34:04 +00:00
Christopher Tate
eafeb8becf DO NOT MERGE Isolated processes don't get precached system service binders
am: 190e66685f

Change-Id: I0ed530e9909811e592f966a44f41400a0146c5b6
2016-10-15 00:33:36 +00:00
Suprabh Shukla
35bd0fc5f0 Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev 2016-10-15 00:26:20 +00:00
TreeHugger Robot
6739ba0280 Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev 2016-10-15 00:24:34 +00:00
Suprabh Shukla
2aa7e5e861 DO NOT MERGE Isolated processes don't get precached system service binders
More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
(backported from commit 2c61c57ac5)

Bug: 30202228

Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
2016-10-14 22:55:29 +00:00