OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 20:53:35 +0000 (20:53 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53
am: 6a9b41dc22

Change-Id: I03af2ccc0f7f671baa4ec9f7b9a3b55f8b377435

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 20:53:16 +0000 (20:53 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580 am: 78976cea8f
am: 2fe15aa6f0

Change-Id: I36fcc82af237645b61c69d70c574843a5b2753c8

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8...
Chia-I Wu [Tue, 16 May 2017 20:50:05 +0000 (20:50 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7
am: 91a7e47a53

Change-Id: I198ba45e3005214e9cd41379d6f833297be93caf

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010...
Dan Stoza [Tue, 16 May 2017 20:49:46 +0000 (20:49 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010 am: 970bb51580
am: 78976cea8f

Change-Id: I30e6a29474b6cf86f97961f527301837b35c8a36

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8
Chia-I Wu [Tue, 16 May 2017 20:46:53 +0000 (20:46 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8
am: 396cc342a7

Change-Id: Ic9f8bce011edd718580971059ae96b0d65c9fdda

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010
Dan Stoza [Tue, 16 May 2017 20:45:35 +0000 (20:45 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am: 98e3c06010
am: 970bb51580

Change-Id: I767956fd15f8be9aa30feb38ad11ec84e98a50bd

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev
Chia-I Wu [Tue, 16 May 2017 20:41:35 +0000 (20:41 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev
am: af33c978c8

Change-Id: I97f957bc5375d11cd034d4b06baa8636e7999f8c

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev
Dan Stoza [Tue, 16 May 2017 20:41:16 +0000 (20:41 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev
am: 98e3c06010

Change-Id: I28774e185329082424a26cfccca4c95c7863e88f

7 years agoMerge "libgui: check for invalid slot in attachBuffer" into lmp-dev
Chia-I Wu [Tue, 16 May 2017 20:33:31 +0000 (20:33 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev

7 years agoMerge "libgui: Check slot received from IGBP in Surface" into lmp-dev
TreeHugger Robot [Tue, 16 May 2017 20:30:06 +0000 (20:30 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:27:40 +0000 (19:27 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e am: 209ad9b6fe
am: d4cbd296d6

Change-Id: I3ddc8b4600015cd53d1a41b687518cdbbc7696b6

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:24:11 +0000 (19:24 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d am: 81bab8081e
am: 209ad9b6fe

Change-Id: I31fe784570c5978faf7484b3f71a074523c0d33c

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:21:39 +0000 (19:21 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c am: 05df3a6f4d
am: 81bab8081e

Change-Id: I78509c86bada44d1d9f9c40e4d64a5120e4c7ab6

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:18:41 +0000 (19:18 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340 am: 5c5ee81b0c
am: 05df3a6f4d

Change-Id: I50c771aee7375315ba6c6aa4029baacfe9c199d8

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am...
Chris Forbes [Tue, 16 May 2017 19:15:38 +0000 (19:15 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0 am: 71d3ef1340
am: 5c5ee81b0c

Change-Id: Ie7ec2067057ea2dbd4b9af0c93a00ba53879b72f

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0
Chris Forbes [Tue, 16 May 2017 19:12:38 +0000 (19:12 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811f0
am: 71d3ef1340

Change-Id: I75797414173ebfb38eefe02ac0a635f10c59d883

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev
Chris Forbes [Tue, 16 May 2017 19:10:08 +0000 (19:10 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev
am: 25556811f0

Change-Id: I5a267f8dccb75625fafd96e67bc0fbb9a2492ce7

7 years agoMerge "ui: Fix bad size check in Fence::unflatten" into klp-dev
Chris Forbes [Tue, 16 May 2017 19:00:54 +0000 (19:00 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev

7 years agoui: Fix bad size check in Fence::unflatten
Chris Forbes [Wed, 10 May 2017 20:12:00 +0000 (13:12 -0700)]
ui: Fix bad size check in Fence::unflatten

Differs slightly from mnc+ patch: GetFlattenedSize was fixed in mnc.

Test: Boot device, run poc from bug, observe no longer crashes
Bug: 37285689
Change-Id: Id8b851733b088cce0d07493fbf76e7e24f9299ad

7 years agolibgui: check for invalid slot in attachBuffer
Chia-I Wu [Mon, 15 May 2017 17:32:27 +0000 (10:32 -0700)]
libgui: check for invalid slot in attachBuffer

Bug: 37478824
Test: manual
Change-Id: I369337d53539bf7f7e3d925bccdae4045da1b404

7 years agolibgui: Check slot received from IGBP in Surface
Dan Stoza [Mon, 1 May 2017 23:31:53 +0000 (16:31 -0700)]
libgui: Check slot received from IGBP in Surface

Checks that the slot number received from mGraphicBufferProducer in
Surface::dequeueBuffer is on the interval [0, NUM_BUFFER_SLOTS) to
protect against a malicious BnGraphicBufferProducer.

Bug: 36991414
Change-Id: I1a76fd1bcce1c558f1c0c30f03638278288ed4fa

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:25:00 +0000 (18:25 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17 am: cc184e4209
am: 2c86168b51

Change-Id: I82f10a43940d6038946f25870c8394900d5219fb

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:21:59 +0000 (18:21 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4 am: e7c7be2c17
am: cc184e4209

Change-Id: I20d492d5b3728ccf2ef68695d54b79f1a3c8371a

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:19:31 +0000 (18:19 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours am: bec844f6d4
am: e7c7be2c17

Change-Id: I79e844eff3739ea737d20f381da6fa4da9852015

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am...
Dan Stoza [Mon, 15 May 2017 18:16:30 +0000 (18:16 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2 am: 057ae95ab2  -s ours
am: bec844f6d4

Change-Id: I48d94557a005c4b0b46bf339ca685e9d1d231d97

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2
Dan Stoza [Mon, 15 May 2017 18:13:30 +0000 (18:13 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e am: 7cb9cd3df2
am: 057ae95ab2  -s ours

Change-Id: I2c6441b19650f31c7bbab9ce22191ae162ba9e58

7 years agolibgui: Check slot received from IGBP in Surface am: ac93b3a30e
Dan Stoza [Mon, 15 May 2017 18:02:29 +0000 (18:02 +0000)]
libgui: Check slot received from IGBP in Surface am: ac93b3a30e
am: 7cb9cd3df2

Change-Id: Iff706258762cac4bfb7d97af7d365412d9ee661d

7 years agolibgui: Check slot received from IGBP in Surface
Dan Stoza [Mon, 15 May 2017 17:59:58 +0000 (17:59 +0000)]
libgui: Check slot received from IGBP in Surface
am: ac93b3a30e

Change-Id: I6ab9bc7f577634c0bf23359b5eb60e6dd07e4854

7 years agolibgui: Check slot received from IGBP in Surface
Dan Stoza [Mon, 1 May 2017 23:31:53 +0000 (16:31 -0700)]
libgui: Check slot received from IGBP in Surface

Checks that the slot number received from mGraphicBufferProducer in
Surface::dequeueBuffer is on the interval [0, NUM_BUFFER_SLOTS) to
protect against a malicious BnGraphicBufferProducer.

Bug: 36991414
Change-Id: I1a76fd1bcce1c558f1c0c30f03638278288ed4fa

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:41:34 +0000 (01:41 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24 am: c7892d9d0b
am: cca3b79c32

Change-Id: I2e5da5ee33eb2757f360881e6ecc7dfd9fb67938

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2ae...
Fabien Sanglard [Thu, 2 Feb 2017 01:38:33 +0000 (01:38 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef am: 3995674f24
am: c7892d9d0b

Change-Id: Ic59ba49542b907591f3e514ae0417ed82a5be7aa

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef
Fabien Sanglard [Thu, 2 Feb 2017 01:36:33 +0000 (01:36 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f am: 132d0f2aef
am: 3995674f24

Change-Id: I979af2b40c8ee1b3820204cee5fa7e21e4906bf9

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f
Fabien Sanglard [Thu, 2 Feb 2017 01:34:03 +0000 (01:34 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834 am: ac2b87ac0f
am: 132d0f2aef

Change-Id: If2aa999ec1f261ea34a6aa725241ea50226083ad

7 years agoFix security vulnerability am: 2ae83f4f62 am: 11ab583834
Fabien Sanglard [Thu, 2 Feb 2017 01:31:32 +0000 (01:31 +0000)]
Fix security vulnerability am: 2ae83f4f62 am: 11ab583834
am: ac2b87ac0f

Change-Id: I3b249a9ec1820917dc015c72bd093535927c9ed6

7 years agoFix security vulnerability am: 2ae83f4f62
Fabien Sanglard [Thu, 2 Feb 2017 01:29:02 +0000 (01:29 +0000)]
Fix security vulnerability am: 2ae83f4f62
am: 11ab583834

Change-Id: I09ec85b9f83e1f4458940415cd07f6fca725c552

7 years agoFix security vulnerability
Fabien Sanglard [Thu, 2 Feb 2017 01:27:03 +0000 (01:27 +0000)]
Fix security vulnerability
am: 2ae83f4f62

Change-Id: Ie0590dbb8429b5b289f3095055abdc8d29b95a7f

7 years agoFix security vulnerability
Fabien Sanglard [Thu, 19 Jan 2017 19:13:20 +0000 (11:13 -0800)]
Fix security vulnerability

Test: hammerhead
Bug: 32628763
Change-Id: I19a81b63fffee8f323a5925c7e8633fbd640b91c

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev
Christopher Tate [Tue, 6 Dec 2016 00:06:18 +0000 (00:06 +0000)]
resolve merge conflicts of 13c5c34 to mnc-dev
am: 79b74d787d

Change-Id: I383dde0596fe37282db3bb62f7ad65e763fdd1dc

7 years agoresolve merge conflicts of 13c5c34 to mnc-dev
Christopher Tate [Mon, 5 Dec 2016 22:10:47 +0000 (14:10 -0800)]
resolve merge conflicts of 13c5c34 to mnc-dev

Change-Id: I7f57cde153648f48ff038400aa437b76971d4771

7 years agoCorrect overflow check in Parcel resize code am: 8b64307e95
Christopher Tate [Mon, 5 Dec 2016 21:23:36 +0000 (21:23 +0000)]
Correct overflow check in Parcel resize code am: 8b64307e95
am: ed6937ae2c

Change-Id: I9ea154fd1f2ca3a69f756066fb49efc99e889224

7 years agoCorrect overflow check in Parcel resize code
Christopher Tate [Mon, 5 Dec 2016 21:20:07 +0000 (21:20 +0000)]
Correct overflow check in Parcel resize code
am: 8b64307e95

Change-Id: I371fb7c6aaf34d44d69c740eea95fe3ba125164a

7 years agoCorrect overflow check in Parcel resize code
Christopher Tate [Thu, 3 Nov 2016 20:32:41 +0000 (13:32 -0700)]
Correct overflow check in Parcel resize code

Bug 31929765

Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409
Fabien Sanglard [Tue, 15 Nov 2016 01:02:49 +0000 (01:02 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409
am: 275b2347ef

Change-Id: Iae0109ec3bddd6f71bab1759003a34e75270f6d4

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2
Fabien Sanglard [Tue, 15 Nov 2016 00:55:19 +0000 (00:55 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2
am: 9d14ab5409

Change-Id: I0ed8d425157308f35b43818a9592267c06cdc807

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0
Fabien Sanglard [Tue, 15 Nov 2016 00:47:19 +0000 (00:47 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0
am: e5c91fe2e2

Change-Id: I0c2becbd05d41fae542a1c68b6f0f26b0f10a15a

7 years agoFix SF security vulnerability: 32706020
Fabien Sanglard [Tue, 15 Nov 2016 00:47:18 +0000 (00:47 +0000)]
Fix SF security vulnerability: 32706020
am: d073eb7a3f

Change-Id: I5b7bf4ecee39de868b9c275531a6f11e65d1c3fd

7 years agoFix SF security vulnerability: 32660278
Fabien Sanglard [Tue, 15 Nov 2016 00:39:18 +0000 (00:39 +0000)]
Fix SF security vulnerability: 32660278
am: 2d8a2432e0

Change-Id: Ia5f419d7d113692f5d52b483f70ca09589333e13

7 years agoFix SF security vulnerability: 32706020
Fabien Sanglard [Tue, 8 Nov 2016 23:35:02 +0000 (15:35 -0800)]
Fix SF security vulnerability: 32706020

Because of lack of mutex lock when get mConsumerName, if one thread
getConsumerName, another thread setConsumerName frequently, an UAF will
be triggered.

Change-Id: Id1bbf0d15de6d16def2f54ecade385058cda3b65
Test: Marling with poc provided in bug report.
Bug: 32706020

7 years agoFix SF security vulnerability: 32660278
Fabien Sanglard [Tue, 8 Nov 2016 23:31:32 +0000 (15:31 -0800)]
Fix SF security vulnerability: 32660278

Because of lack of mutex lock when get mSidebandStream, if one thread
getSidebandStream, another thread setSidebandStream frequently, an UAF
will be triggered.

Bug: 32660278
Test: Marlin device with poc
Change-Id: Idbcf0976ce2db682d0f13455105c45a5c7481a45

7 years agoServiceManager: Allow system services running as secondary users to add services...
Arve Hjnnevg [Fri, 19 Aug 2016 01:04:30 +0000 (01:04 +0000)]
ServiceManager: Allow system services running as secondary users to add services am: e6bbe69ba7 am: 2cb14836ac am: c29c3734af am: ce0e72911c
am: 2c39ea1025

Change-Id: I355431fb0c566965759cd3d07d481c475cb494d0

7 years agoServiceManager: Allow system services running as secondary users to add services...
Arve Hjnnevg [Fri, 19 Aug 2016 01:01:29 +0000 (01:01 +0000)]
ServiceManager: Allow system services running as secondary users to add services am: e6bbe69ba7 am: 2cb14836ac am: c29c3734af
am: ce0e72911c

Change-Id: I2c36fdb4c92359a03af1c8a563d4d73b9e2898a2

7 years agoServiceManager: Allow system services running as secondary users to add services...
Arve Hjnnevg [Fri, 19 Aug 2016 00:58:34 +0000 (00:58 +0000)]
ServiceManager: Allow system services running as secondary users to add services am: e6bbe69ba7 am: 2cb14836ac
am: c29c3734af

Change-Id: I72992d6662bbace5cecce2b96389139c96d2e181

7 years agoServiceManager: Allow system services running as secondary users to add services...
Arve Hjnnevg [Fri, 19 Aug 2016 00:49:29 +0000 (00:49 +0000)]
ServiceManager: Allow system services running as secondary users to add services am: e6bbe69ba7
am: 2cb14836ac

Change-Id: Ia7deecedc7eff4fb35742ba9c7475ca32ecf48aa

7 years agoServiceManager: Allow system services running as secondary users to add services
Arve Hjnnevg [Fri, 19 Aug 2016 00:46:28 +0000 (00:46 +0000)]
ServiceManager: Allow system services running as secondary users to add services
am: e6bbe69ba7

Change-Id: Iebb7be5ff42026adb2ff2d2b610902b995acdbc0

7 years agoServiceManager: Allow system services running as secondary users to add services
Arve Hjønnevåg [Thu, 18 Aug 2016 22:42:35 +0000 (15:42 -0700)]
ServiceManager: Allow system services running as secondary users to add services

This should be reverted when all system services have been cleaned up to not
do this. A process looking up a service while running in the background will
see the service registered by the active user (assuming the service is
registered on every user switch), not the service registered by the user that
the process itself belongs to.

BUG: 30795333
Change-Id: I1b74d58be38ed358f43c163692f9e704f8f31dbe

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36 -s ours am:...
Arve Hjnnevg [Tue, 9 Aug 2016 21:10:26 +0000 (21:10 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36  -s ours am: a82f82293a am: 1c220583e4 am: ce472fbb54  -s ours
am: e8cb9c8982

Change-Id: I9445235baf1ea98e3e47af3034fa49b0593ae1b2

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36 -s ours am:...
Arve Hjnnevg [Tue, 9 Aug 2016 21:07:31 +0000 (21:07 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36  -s ours am: a82f82293a am: 1c220583e4
am: ce472fbb54  -s ours

Change-Id: I9ac9efe65b6985fc7bd4e7be8a37e471023bd450

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36 -s ours am:...
Arve Hjnnevg [Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36  -s ours am: a82f82293a
am: 1c220583e4

Change-Id: Ie1ab626a476ecada3ed5171489dc3fec0cf5a1f5

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36 -s ours
Arve Hjnnevg [Tue, 9 Aug 2016 21:01:23 +0000 (21:01 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36  -s ours
am: a82f82293a

Change-Id: Ib91d630f70f4fa434915ac15938c7dca94fe3de5

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931...
Arve Hjnnevg [Tue, 9 Aug 2016 20:58:24 +0000 (20:58 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931 am: 101c678909  -s ours
am: e55418a857

Change-Id: If0008ff56fb3348ac1bef2c77e99032bf6d51680

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:31 +0000 (20:55 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931
am: 101c678909  -s ours

Change-Id: I3c98fc1516193caab37bcb9cf88ffe6104dd65b1

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:23 +0000 (20:55 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am: eb304f0a36  -s ours

Change-Id: I6bae641d0ec80aaba79b716ef8bcd46279aca0ed

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340
Arve Hjnnevg [Tue, 9 Aug 2016 20:49:54 +0000 (20:49 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340
am: 171ab27931

Change-Id: I3cfc70e8fb1dd393a92ace283d36ee2b35585ea4

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check
Arve Hjnnevg [Tue, 9 Aug 2016 20:46:49 +0000 (20:46 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am: 247ae46340

Change-Id: I67af781d5876b13daca82cb7e947397c94cd62e7

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check
Arve Hjnnevg [Tue, 9 Aug 2016 20:46:49 +0000 (20:46 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am: f03ba2c0d8

Change-Id: I1435bfcd119116cdd242cf7714ef9535d7abc6fa

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check

Prevent apps from registering services without relying on selinux checks.

Bug: 29431260

Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check

Prevent apps from registering services without relying on selinux checks.

Bug: 29431260

Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b

7 years agoDO NOT MERGE ServiceManager: Restore basic uid check
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check

Prevent apps from registering services without relying on selinux checks.

Bug: 29431260

Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b

8 years agoRegion: Detect malicious overflow in unflatten
Pablo Ceballos [Mon, 18 Jul 2016 22:25:45 +0000 (22:25 +0000)]
Region: Detect malicious overflow in unflatten
am: 1a65fccc50

Change-Id: I597a130dfe82c21c5611f45f6977b189c0a1a8ea

8 years agoRegion: Detect malicious overflow in unflatten
Pablo Ceballos [Wed, 13 Jul 2016 21:11:57 +0000 (14:11 -0700)]
Region: Detect malicious overflow in unflatten

Bug 29983260

Change-Id: Ib6e1cb8ae279010c5e9960aaa03513f55b7d873b

8 years agoAdd FrameStats default constructor am: 9a8c42a72b am: 8cd7d257de am: 67105cc24d am...
Pablo Ceballos [Mon, 13 Jun 2016 18:13:16 +0000 (18:13 +0000)]
Add FrameStats default constructor am: 9a8c42a72b am: 8cd7d257de am: 67105cc24d am: b990d75315
am: a1952f0a6d

Change-Id: Icc23cc2a483b13c6ac2134008d553574fffe06f4

8 years agoAdd FrameStats default constructor am: 9a8c42a72b am: 8cd7d257de am: 67105cc24d
Pablo Ceballos [Mon, 13 Jun 2016 18:09:20 +0000 (18:09 +0000)]
Add FrameStats default constructor am: 9a8c42a72b am: 8cd7d257de am: 67105cc24d
am: b990d75315

Change-Id: Ibc0caec8dc613a6701791f1a633f3793522615af

8 years agoAdd FrameStats default constructor am: 9a8c42a72b am: 8cd7d257de
Pablo Ceballos [Mon, 13 Jun 2016 18:04:17 +0000 (18:04 +0000)]
Add FrameStats default constructor am: 9a8c42a72b am: 8cd7d257de
am: 67105cc24d

Change-Id: Icf85c944e561763b0a9c353f84d614a992168c20

8 years agoAdd FrameStats default constructor am: 9a8c42a72b
Pablo Ceballos [Mon, 13 Jun 2016 18:00:25 +0000 (18:00 +0000)]
Add FrameStats default constructor am: 9a8c42a72b
am: 8cd7d257de

Change-Id: Ic0df6b15e28ac2acda566fa7f30c9460d36f2a00

8 years agoAdd FrameStats default constructor
Pablo Ceballos [Mon, 13 Jun 2016 17:56:06 +0000 (17:56 +0000)]
Add FrameStats default constructor
am: 9a8c42a72b

Change-Id: Ib78d68c71438391711ea3b91102408d5ad0b966b

8 years agoAdd FrameStats default constructor
Pablo Ceballos [Thu, 26 May 2016 22:35:55 +0000 (15:35 -0700)]
Add FrameStats default constructor

Bug 28592402

Change-Id: I857e46c9ab3ffae0d96923d665d13a4128a6cafa

8 years agoCorrectly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f6...
Marco Nelissen [Mon, 9 May 2016 21:22:14 +0000 (21:22 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f60f9 am: 853702ce3d am: 775f2e6dbf am: 82afbe2258 am: c2c470c700 am: 56dea28189
am: bca20d8376

* commit 'bca20d8376708da7ed835e71442ab52197d1e9c0':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: Ia0845cc9f58fcb2cca204118cbaff6e251ed0b8e

8 years agoCorrectly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f6...
Marco Nelissen [Mon, 9 May 2016 21:16:30 +0000 (21:16 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f60f9 am: 853702ce3d am: 775f2e6dbf am: 82afbe2258 am: c2c470c700
am: 56dea28189

* commit '56dea28189ff0894d24ebb63650ad5159031549c':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I283fd9ad78ddb434d831adaef58db22a57b335f6

8 years agoCorrectly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f6...
Marco Nelissen [Mon, 9 May 2016 21:11:03 +0000 (21:11 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f60f9 am: 853702ce3d am: 775f2e6dbf am: 82afbe2258
am: c2c470c700

* commit 'c2c470c700a4e0fbbcd5b99da144f02cee7b9b3e':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I68084d5f6bfd4b209c738b94a0f31fe9db113d9f

8 years agoCorrectly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f6...
Marco Nelissen [Mon, 9 May 2016 21:05:18 +0000 (21:05 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f60f9 am: 853702ce3d am: 775f2e6dbf
am: 82afbe2258

* commit '82afbe2258c5c5e18ea6e9496d590cff177e67d4':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I2c52991c2e6b1c5ef2eebbc4649b36c30dd9120d

8 years agoCorrectly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f6...
Marco Nelissen [Mon, 9 May 2016 20:59:50 +0000 (20:59 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f60f9 am: 853702ce3d
am: 775f2e6dbf

* commit '775f2e6dbf757d1b1853337c19bf15f15a127e31':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: Ibfc37203a33c603df365ed9cbb85632d34acafbd

8 years agoCorrectly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f60f9
Marco Nelissen [Mon, 9 May 2016 20:54:25 +0000 (20:54 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f60f9
am: 853702ce3d

* commit '853702ce3d1ba5e45ce58f332ed1d40008a44375':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I2b8f6070ecc873d67be5a4c72ca870606af93a3d

8 years agoCorrectly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72
Marco Nelissen [Mon, 9 May 2016 20:48:32 +0000 (20:48 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72
am: 275c9f60f9

* commit '275c9f60f94780bd686eca9750ec41cc1fafa333':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I6516dea7eac82d06e1ffd1d269dbb6415fece948

8 years agoCorrectly handle dup() failure in Parcel::readNativeHandle
Marco Nelissen [Mon, 9 May 2016 20:43:16 +0000 (20:43 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle
am: 1de7966c72

* commit '1de7966c72981aebc3c7f9978ab129678ac89258':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: Ie043622a17b241c489429273d369e9a478b7ebcc

8 years agoCorrectly handle dup() failure in Parcel::readNativeHandle
Marco Nelissen [Tue, 26 Apr 2016 15:44:09 +0000 (08:44 -0700)]
Correctly handle dup() failure in Parcel::readNativeHandle

bail out if dup() fails, instead of creating an invalid native_handle_t

Bug: 28395952

Change-Id: Ia1a6198c0f45165b9c6a55a803e5f64d8afa0572

8 years agoMerge "Add new MotionEvent flag for partially obscured windows." into mnc-dev
Michael Wright [Mon, 18 Apr 2016 18:48:20 +0000 (18:48 +0000)]
Merge "Add new MotionEvent flag for partially obscured windows." into mnc-dev
am: 58dc18a

* commit '58dc18a43d0a832c3d684bbc27f8d4a3341c1582':
  Add new MotionEvent flag for partially obscured windows.

Change-Id: I7d75c5a4c41e9b56cceac91ae731a85a3186b8f7

8 years agoMerge "Add new MotionEvent flag for partially obscured windows." into mnc-dev
Michael Wright [Mon, 18 Apr 2016 18:40:17 +0000 (18:40 +0000)]
Merge "Add new MotionEvent flag for partially obscured windows." into mnc-dev

8 years agoAdd new MotionEvent flag for partially obscured windows.
Michael Wright [Tue, 22 Mar 2016 23:52:13 +0000 (16:52 -0700)]
Add new MotionEvent flag for partially obscured windows.

Due to more complex window layouts resulting in lots of overlapping
windows, the policy around FLAG_WINDOW_IS_OBSCURED has changed to
only be set when the point at which the window was touched is
obscured. Unfortunately, this doesn't prevent tapjacking attacks that
overlay the dialog's text, making a potentially dangerous operation
seem innocuous. To avoid this on particularly sensitive dialogs,
introduce a new flag that really does tell you when your window is
being even partially overlapped.

We aren't exposing this as API since we plan on making the original
flag more robust. This is really a workaround for system dialogs
since we generally know their layout and screen position, and that
they're unlikely to be overlapped by other applications.

Bug: 26677796
Change-Id: I9e336afe90f262ba22015876769a9c510048fd47

8 years agoFix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17 am: 74d2c4b...
Dianne Hackborn [Wed, 23 Mar 2016 22:27:34 +0000 (22:27 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17 am: 74d2c4b  -s ours am: 162fecd am: 5ad8d44 am: b38df7b
am: 4e067d2

* commit '4e067d26119e6b995b795eb2b0a921b24595ab47':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17 am: 74d2c4b...
Dianne Hackborn [Wed, 23 Mar 2016 22:25:12 +0000 (22:25 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17 am: 74d2c4b  -s ours am: 162fecd am: 5ad8d44
am: b38df7b

* commit 'b38df7b4e9d93686c62d9ec654bba3be6e561d56':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17 am: 74d2c4b...
Dianne Hackborn [Wed, 23 Mar 2016 22:22:54 +0000 (22:22 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17 am: 74d2c4b  -s ours am: 162fecd
am: 5ad8d44

* commit '5ad8d443776e74a56e0e461ae6d333cf52e4f591':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17 am: 74d2c4b...
Dianne Hackborn [Wed, 23 Mar 2016 22:17:30 +0000 (22:17 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17 am: 74d2c4b  -s ours
am: 162fecd

* commit '162fecdc2c98844faaa6cb43a4fbe854f511b077':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17
Dianne Hackborn [Wed, 23 Mar 2016 22:15:19 +0000 (22:15 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder am: 41e7b17
am: 74d2c4b  -s ours

* commit '74d2c4b4c97dbbcf43a9f8870007593d61beb547':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder am: 12bafe2 am: b4f0f33...
Dianne Hackborn [Wed, 23 Mar 2016 22:15:19 +0000 (22:15 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder am: 12bafe2 am: b4f0f33 am: e564a36
am: 1e2ce52

* commit '1e2ce52e97a27f5d9cd68c809f63e56847c658ac':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder am: 12bafe2 am: b4f0f33
Dianne Hackborn [Wed, 23 Mar 2016 22:13:04 +0000 (22:13 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder am: 12bafe2 am: b4f0f33
am: e564a36

* commit 'e564a36b5ca8ef3cacaebb4707b0e8e38b6d7d2d':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder am: 12bafe2
Dianne Hackborn [Wed, 23 Mar 2016 22:10:22 +0000 (22:10 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder am: 12bafe2
am: b4f0f33

* commit 'b4f0f339c714be74cf0ae17e4c88620130b02121':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Wed, 23 Mar 2016 22:07:32 +0000 (22:07 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder
am: 41e7b17

* commit '41e7b1780f106d2eb4304b1f9cf060ce44177cae':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Wed, 23 Mar 2016 22:05:07 +0000 (22:05 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder
am: ce156f6

* commit 'ce156f60adb32c7cbebe50e313f51e564f93fe99':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Wed, 23 Mar 2016 22:05:06 +0000 (22:05 +0000)]
Fix issue #27252896: Security Vulnerability -- weak binder
am: 12bafe2

* commit '12bafe205c236da50f34ed85adf62a5631525ab6':
  Fix issue #27252896: Security Vulnerability -- weak binder

8 years agoFix issue #27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Mon, 21 Mar 2016 17:36:54 +0000 (10:36 -0700)]
Fix issue #27252896: Security Vulnerability -- weak binder

Sending transaction to freed BBinder through weak handle
can cause use of a (mostly) freed object.  We need to try to
safely promote to a strong reference first.

Change-Id: Ic9c6940fa824980472e94ed2dfeca52a6b0fd342
(manually cherry picked and resolved conflicts from commit
c11146106f94e07016e8e26e4f8628f9a0c73199)