OSDN Git Service

android-x86/frameworks-av.git
7 years agoLimit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605
Marco Nelissen [Wed, 21 Sep 2016 20:51:33 +0000 (20:51 +0000)]
Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605
am: 29ccd8c55d  -s ours

Change-Id: If514b12f86a85a90ff0835eeafa5a31324ec3c17

7 years agoLimit mp4 atom size to something reasonable am: 638c99bad6
Marco Nelissen [Wed, 21 Sep 2016 20:41:31 +0000 (20:41 +0000)]
Limit mp4 atom size to something reasonable am: 638c99bad6
am: 569f3db605

Change-Id: Icc063dd70e08fea6320e3d3f64ebbd4ba51d8aa8

7 years agoLimit mp4 atom size to something reasonable
Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]
Limit mp4 atom size to something reasonable
am: 638c99bad6

Change-Id: I1284a0b7a44c5f7a8d88b931114e201d8cb09601

7 years agoLimit mp4 atom size to something reasonable
Marco Nelissen [Mon, 19 Sep 2016 23:22:56 +0000 (16:22 -0700)]
Limit mp4 atom size to something reasonable

Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a

7 years agoCheck mprotect result am: 866c800c06 am: a0cfcf38d4
Marco Nelissen [Wed, 21 Sep 2016 14:44:02 +0000 (14:44 +0000)]
Check mprotect result am: 866c800c06 am: a0cfcf38d4
am: 638aca47be

Change-Id: I337dd1d62a4cd52de051afd4d9b919a742ad20fe

7 years agoCheck mprotect result am: 866c800c06
Marco Nelissen [Wed, 21 Sep 2016 14:41:28 +0000 (14:41 +0000)]
Check mprotect result am: 866c800c06
am: a0cfcf38d4

Change-Id: I0f188e2c717922689df42af21f6c47a865a8c390

7 years agoCheck mprotect result
Marco Nelissen [Wed, 21 Sep 2016 14:38:58 +0000 (14:38 +0000)]
Check mprotect result
am: 866c800c06

Change-Id: I7b20d72aafb9a95480c1a6b16f0cafc4d1749470

7 years agoCheck mprotect result
Marco Nelissen [Tue, 20 Sep 2016 20:36:40 +0000 (13:36 -0700)]
Check mprotect result

mprotect can theoretically fail, which could then let one exploit
a vulnerable codec if one exists on the device.

Bug: 31350239
Change-Id: I7b99c190619f0fb2eb93119596e6da0d2deb8ba5

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am...
Ricardo Garcia [Tue, 20 Sep 2016 00:46:09 +0000 (00:46 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5
am: d7822b3313

Change-Id: Iec66f66b4239b395253d757d57725ecd20320c13

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196
rago [Tue, 20 Sep 2016 00:46:03 +0000 (00:46 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196
am: bad0250dcb

Change-Id: I23660e1da14f232ff786f9ab78da3e26f301c1b2

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141
Chong Zhang [Tue, 20 Sep 2016 00:45:37 +0000 (00:45 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141
am: dfe5b5193c

Change-Id: Ibd28b74deb652eb61b08e933a5e288d145841a14

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952
Ricardo Garcia [Tue, 20 Sep 2016 00:39:45 +0000 (00:39 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952
am: f59ab362c5

Change-Id: I9b65bbed0946bb25b25772f24256dbe1f8fe022c

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52
rago [Tue, 20 Sep 2016 00:39:33 +0000 (00:39 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52
am: 8720f85196

Change-Id: I0803632824e6fc5a70ad6a1ba36743eb11cc3e7e

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2
Chong Zhang [Tue, 20 Sep 2016 00:39:03 +0000 (00:39 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2
am: 86d9bb9141

Change-Id: Id27e600a2c500634cd56bb8367f8d7ce811d63e8

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev
Ricardo Garcia [Tue, 20 Sep 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev
am: b602286952

Change-Id: Ic0cd9c82a5417e0281db38d806956876d95801fc

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 20 Sep 2016 00:35:04 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am: 46dc714d52

Change-Id: I61f5adb793d2c54c078211213b25fd7ea37a3895

7 years agoIOMX: do not clear buffer if it's allocated by component
Chong Zhang [Tue, 20 Sep 2016 00:29:11 +0000 (00:29 +0000)]
IOMX: do not clear buffer if it's allocated by component
am: ea76573aa2

Change-Id: Id77521c1d8a2e3c0f24b3467db0cea1907d5b934

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev
Ricardo Garcia [Tue, 20 Sep 2016 00:27:26 +0000 (00:27 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev

7 years agoIOMX: do not clear buffer if it's allocated by component
Chong Zhang [Mon, 19 Sep 2016 22:29:04 +0000 (15:29 -0700)]
IOMX: do not clear buffer if it's allocated by component

The component might depends on their buffers to be initialized
in certain ways to work. Don't clear unless we're allocating it.

bug: 31586647
Change-Id: Ia0a125797e414998ef0cd8ce03672f5b1e0bbf7a

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc
Lajos Molnar [Thu, 15 Sep 2016 22:41:53 +0000 (22:41 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc
am: 9a565c52b0

Change-Id: If2465b5f16cc58d5d0d7cda3e117ad863dafd479

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b
Lajos Molnar [Thu, 15 Sep 2016 22:39:55 +0000 (22:39 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b
am: 99accf6cdc

Change-Id: I2f80600bad65948b26e839d8588b98a574ffba9b

7 years agoIOMX: allow configuration after going to loaded state
Lajos Molnar [Thu, 15 Sep 2016 22:36:52 +0000 (22:36 +0000)]
IOMX: allow configuration after going to loaded state
am: c13904014b

Change-Id: Ibc6e43830d08890077691ebd55b1515554b94053

7 years agoIOMX: allow configuration after going to loaded state
Lajos Molnar [Wed, 14 Sep 2016 17:01:37 +0000 (10:01 -0700)]
IOMX: allow configuration after going to loaded state

This was disallowed recently but we still use it as MediaCodcec.stop
only goes to loaded state, and does not free component.

Bug: 31450460
Change-Id: I72e092e4e55c9f23b1baee3e950d76e84a5ef28d

7 years agoMerge "SoundTrigger: get service by value." into lmp-dev
Eric Laurent [Tue, 13 Sep 2016 23:04:34 +0000 (23:04 +0000)]
Merge "SoundTrigger: get service by value." into lmp-dev

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am...
Lajos Molnar [Fri, 9 Sep 2016 17:02:17 +0000 (17:02 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be
am: 56100a30ba  -s ours

Change-Id: Ia6831ce8b12461719321b444bd4475eb3eb6fa1c

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d
Lajos Molnar [Fri, 9 Sep 2016 17:02:16 +0000 (17:02 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d
am: c5251a627c  -s ours

Change-Id: I356ac50c59cdfa23a67b6e2d7d508c0e02a28901

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am...
Lajos Molnar [Fri, 9 Sep 2016 17:00:31 +0000 (17:00 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1
am: 9c7f0824be

Change-Id: Ibd31110a7191c39b09947f5026c2c50af3e0146c

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c
Lajos Molnar [Fri, 9 Sep 2016 16:59:46 +0000 (16:59 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c
am: ee9effab3d

Change-Id: I64bd10fa5e5e5a020c129c0b77d813a2772376a0

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev
am: 425cc025a1

Change-Id: I271b7657d85973bf745d3d099d36fc6858442f88

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing
Lajos Molnar [Fri, 9 Sep 2016 16:56:45 +0000 (16:56 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing
am: 807e827d4c

Change-Id: I514b6b8fce06d666799fcd5f41238e81598c0aa9

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev
Lajos Molnar [Fri, 9 Sep 2016 16:52:06 +0000 (16:52 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev
Lajos Molnar [Fri, 9 Sep 2016 16:51:52 +0000 (16:51 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev

7 years agoSoundTrigger: get service by value.
Eric Laurent [Wed, 7 Sep 2016 23:58:39 +0000 (16:58 -0700)]
SoundTrigger: get service by value.

Get strong pointer to service interface by value and not reference to
prevent race conditions where the service pointer can be cleared
by another thread while in use.

Bug: 30907212
Change-Id: I6f02ec3fd1e6392b842b334e1cc4f9aa23916009

7 years agoMediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a
Wei Jia [Wed, 31 Aug 2016 00:08:25 +0000 (00:08 +0000)]
MediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a
am: 0dd714e408

Change-Id: Ib620e8573ff6da861c101311143d266fd5086d7b

7 years agoMediaPlayerService: allow next player to be NULL am: 2828412787
Wei Jia [Wed, 31 Aug 2016 00:05:25 +0000 (00:05 +0000)]
MediaPlayerService: allow next player to be NULL am: 2828412787
am: f4e00a7c5a

Change-Id: I4b72afd20bbca69423d1be6ebf963ed41ded1a4e

7 years agoMediaPlayerService: allow next player to be NULL
Wei Jia [Wed, 31 Aug 2016 00:02:55 +0000 (00:02 +0000)]
MediaPlayerService: allow next player to be NULL
am: 2828412787

Change-Id: I54fad659721dde258259a503c5514d6327e521f7

7 years agoMediaPlayerService: allow next player to be NULL
Wei Jia [Tue, 30 Aug 2016 20:49:06 +0000 (13:49 -0700)]
MediaPlayerService: allow next player to be NULL

Bug: 31155917
Bug: 30204103
Change-Id: I9a2a59ddb900fc942e7c19b31b53a110d790474c

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 23 Aug 2016 00:20:26 +0000 (17:20 -0700)]
Fix potential overflow in Visualizer effect

Bug: 30229821
Change-Id: Idd3c1563dc9d3261e6e168e945005bf133ab2cdb
(cherry picked from commit 099ab280775946e7c36c73fde47f2ee5a2579f53)

7 years agoMerge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am...
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452
am: 7fa7052231  -s ours

Change-Id: I5dddb4aeffa111dfda64e335d7baf7758a1740ee

7 years agoDO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9
am: 48b3aca54b  -s ours

Change-Id: I1f9d2549a454da70e62cf2cc997c045965ecea9a

7 years agoMerge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am...
Robert Shih [Mon, 22 Aug 2016 18:23:42 +0000 (18:23 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262
am: 24b2dba452

Change-Id: Ia3933416f651d737beaae34cab4efd35e9e6156d

7 years agoDO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12
Robert Shih [Mon, 22 Aug 2016 18:23:40 +0000 (18:23 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12
am: 2cee1deec9

Change-Id: I0cde33c6f069de9eac4e954e9c6ed6f6968546be

7 years agoMerge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
am: 4fb531e262

Change-Id: I3cb099c3fdf0c476a92392b185d782e980a463de

7 years agoDO NOT MERGE MediaPlayerService: avoid invalid static cast
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast
am: c159a5ae12

Change-Id: I3e349cb44073359b9c009100c341864468187f68

7 years agoMerge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
Robert Shih [Mon, 22 Aug 2016 17:53:09 +0000 (17:53 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev

7 years agoMerge "MediaPlayerService: avoid invalid static cast" into lmp-dev
Robert Shih [Mon, 22 Aug 2016 17:53:05 +0000 (17:53 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev

7 years agoMerge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev
Andy Hung [Fri, 19 Aug 2016 21:27:39 +0000 (21:27 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev

7 years agoMerge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am...
Andy Hung [Fri, 19 Aug 2016 19:04:15 +0000 (19:04 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac
am: 53657baf41

Change-Id: I8576f997100e7cc55eb7d96a2af01eb88b4b1ba5

7 years agoAdd EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324
Andy Hung [Fri, 19 Aug 2016 19:04:15 +0000 (19:04 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324
am: ebd9f1029e

Change-Id: Ic2fa5bba22d9ffc7b69ea97e2e4bc44d8a0fa42d

7 years agoMerge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42
Andy Hung [Fri, 19 Aug 2016 18:59:07 +0000 (18:59 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42
am: 19294437ac

Change-Id: I926b0e3df89ff3c648c7b6896c359808300896b6

7 years agoAdd EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501
Andy Hung [Fri, 19 Aug 2016 18:59:06 +0000 (18:59 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501
am: 19d8a61324

Change-Id: I002990dc446d8a713f41b77671d17dbb11a914f9

7 years agoMerge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
Andy Hung [Fri, 19 Aug 2016 18:54:13 +0000 (18:54 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
am: 9665548a42

Change-Id: I784a0df389663da64dfa9a3eadb8b4dd6af545c7

7 years agoAdd EFFECT_CMD_SET_PARAM parameter checking
Andy Hung [Fri, 19 Aug 2016 18:54:12 +0000 (18:54 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking
am: e4a1d91501

Change-Id: I0b45b8c0fdccc9016717ce21de6771e9e6b6f11f

7 years agoMerge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
Andy Hung [Fri, 19 Aug 2016 18:49:14 +0000 (18:49 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev

7 years agoDO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
Pawin Vongmasa [Fri, 19 Aug 2016 17:04:02 +0000 (17:04 +0000)]
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65
am: 2a21f09fff  -s ours

Change-Id: I540ae20fea8366c44796e104662b505192926270

7 years agoDO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
Pawin Vongmasa [Fri, 19 Aug 2016 16:57:03 +0000 (16:57 +0000)]
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743
am: 453ba68c65

Change-Id: I833cb55b51e554e6b2ef3227f2923def6643c9e4

7 years agoDO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
Pawin Vongmasa [Fri, 19 Aug 2016 16:54:03 +0000 (16:54 +0000)]
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
am: ad929db743

Change-Id: Ib2ef17356334d2340a5aa0250a4b5ffbdd9c4dd0

7 years agoMerge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d...
Pawin Vongmasa [Fri, 19 Aug 2016 16:53:17 +0000 (16:53 +0000)]
Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev

7 years agoMerge "better validation lengths of strings in ID3 tags" into lmp-dev
Ray Essick [Fri, 19 Aug 2016 16:33:48 +0000 (16:33 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev

7 years agoDO NOT MERGE - Fix build breakage caused by commit
Pawin Vongmasa [Fri, 19 Aug 2016 08:45:39 +0000 (01:45 -0700)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: Ic55a9ab25ddb57f270c21d78ffcb556f3e11dd5d

7 years agoFix build breakage caused by commit
Pawin Vongmasa [Fri, 19 Aug 2016 09:07:33 +0000 (02:07 -0700)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: I4776db4a26fb3c31bb994d48788373fe569c812a

7 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame...
Pawin Vongmasa [Fri, 19 Aug 2016 02:50:08 +0000 (02:50 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887
am: b71a431eab  -s ours

Change-Id: I2b59b1bf145b023796e66cc13e385d5ec1c80b54

7 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame...
Pawin Vongmasa [Fri, 19 Aug 2016 02:43:37 +0000 (02:43 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b
am: 920b0f7887

Change-Id: I603ab931f82d8a83187be989dccb8686de8bf95e

7 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Pawin Vongmasa [Fri, 19 Aug 2016 02:40:37 +0000 (02:40 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am: 940829f69b

Change-Id: I3df8797998bac785ad198cb4fb2401779a3947ff

7 years agoAdd EFFECT_CMD_SET_PARAM parameter checking
Andy Hung [Wed, 17 Aug 2016 21:11:13 +0000 (14:11 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking

Bug: 30204301
Change-Id: Ib9c3ee1c2f23c96f8f7092dd9e146bc453d7a290

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing
Lajos Molnar [Tue, 2 Aug 2016 14:07:05 +0000 (07:07 -0700)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
  OMXNodeInstance alone. This disallows enabling metadata mode
  without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/tunneling/input surface
  after first sendCommand. (Except to Idle state for OMXCodec quirk.)
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

[backported from L-MR1]

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing
Lajos Molnar [Tue, 2 Aug 2016 14:07:05 +0000 (07:07 -0700)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
  OMXNodeInstance alone. This disallows enabling metadata mode
  without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/input surface
  after first sendCommand (except to Idle for OMXCodec quirk).
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

[backported from L]

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e

7 years agosoundtrigger: add size check on sound model and recogntion data
Eric Laurent [Wed, 17 Aug 2016 13:19:32 +0000 (06:19 -0700)]
soundtrigger: add size check on sound model and recogntion data

Bug: 30148546

Change-Id: I082f535a853c96571887eeea37c6d41ecee7d8c0
(cherry picked from commit bb00d8f139ff51336ab3c810d35685003949bcf8)

7 years agoDO NOT MERGE MediaPlayerService: avoid invalid static cast
Robert Shih [Tue, 16 Aug 2016 23:50:54 +0000 (16:50 -0700)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast

Bug: 30204103
Change-Id: Ie0dd3568a375f1e9fed8615ad3d85184bcc99028

7 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)

7 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)

7 years agoMediaPlayerService: avoid invalid static cast
Robert Shih [Tue, 16 Aug 2016 23:50:54 +0000 (16:50 -0700)]
MediaPlayerService: avoid invalid static cast

Bug: 30204103
Change-Id: Ie0dd3568a375f1e9fed8615ad3d85184bcc99028

7 years agobetter validation lengths of strings in ID3 tags
Ray Essick [Tue, 16 Aug 2016 21:24:43 +0000 (14:24 -0700)]
better validation lengths of strings in ID3 tags

Validate lengths on strings in ID3 tags, particularly around 0.
Also added code to handle cases when we can't get memory for
copies of strings we want to extract from these tags.

Affects L/M/N/master, same patch for all of them.

Bug: 30744884
Change-Id: I2675a817a39f0927ec1f7e9f9c09f2e61020311e
Test: play mp3 file which caused a <0 length.

7 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
Marco Nelissen [Mon, 1 Aug 2016 21:08:39 +0000 (21:08 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev

7 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3
Wonsik Kim [Mon, 1 Aug 2016 20:33:17 +0000 (20:33 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3
am: e40e452a3a  -s ours

Change-Id: Ib76f39590bc10ace428d2e142db1f752ac3567c6

7 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2
Wonsik Kim [Mon, 1 Aug 2016 20:30:39 +0000 (20:30 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2
am: 8df5df78a3

Change-Id: Iba844e14f530d15531c5b47e7aaaedfd7849813b

7 years agoDO NOT MERGE - stagefright: fix integer overflow error
Wonsik Kim [Mon, 1 Aug 2016 20:28:10 +0000 (20:28 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am: 17a10c50e2

Change-Id: I310e406b5370678b112f5ad0603e22456d6c3de7

7 years agoDO NOT MERGE - stagefright: fix integer overflow error
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)

7 years agoDO NOT MERGE - stagefright: fix integer overflow error
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)

8 years agoomx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5
Wonsik Kim [Tue, 19 Jul 2016 22:51:43 +0000 (22:51 +0000)]
omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5
am: f054728108

Change-Id: I230da4ea86abf01ff9057900f0eea1af151c9a00

8 years agoomx: prevent input port enable/disable for software codecs am: 2b94fa8277
Wonsik Kim [Tue, 19 Jul 2016 22:46:54 +0000 (22:46 +0000)]
omx: prevent input port enable/disable for software codecs am: 2b94fa8277
am: c83b53c9e5

Change-Id: I6eeb301a2418cae6a57e49ed29527edd5e8de2b0

8 years agoomx: prevent input port enable/disable for software codecs
Wonsik Kim [Tue, 19 Jul 2016 22:44:18 +0000 (22:44 +0000)]
omx: prevent input port enable/disable for software codecs
am: 2b94fa8277

Change-Id: I5c370c34986be1435f2d0eebae8e264c0f4f0f44

8 years agoomx: prevent input port enable/disable for software codecs
Wonsik Kim [Thu, 7 Jul 2016 03:57:02 +0000 (12:57 +0900)]
omx: prevent input port enable/disable for software codecs

Bug: 29421804
Change-Id: Iba1011e9af942a6dff7f659af769a51e3f5ba66f

8 years agoDO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270
Robert Shih [Thu, 14 Jul 2016 23:04:02 +0000 (23:04 +0000)]
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270
am: 1038762b09  -s ours

Change-Id: I43d1bdb6bd3f432b44513687d1736fc344c68f9a

8 years agoDO NOT MERGE - Fix build am: bf835e4525
Robert Shih [Thu, 14 Jul 2016 23:01:31 +0000 (23:01 +0000)]
DO NOT MERGE - Fix build am: bf835e4525
am: 98b31b9270

Change-Id: Ib3dd2d315096bcb31dbfcd5be66f00d482594c9b

8 years agoDO NOT MERGE - Fix build
Robert Shih [Thu, 14 Jul 2016 22:58:30 +0000 (22:58 +0000)]
DO NOT MERGE - Fix build
am: bf835e4525

Change-Id: Idd0b7779345c8b4c595681de7431c3339b44129e

8 years agoDO NOT MERGE - Fix build
Robert Shih [Thu, 14 Jul 2016 22:32:08 +0000 (15:32 -0700)]
DO NOT MERGE - Fix build

Change-Id: Iff47bb735778fb275abeee573c636856b839feb5

8 years agoMerge "DO NOT MERGE - SoftMP3: memset safely" into lmp-dev
Robert Shih [Thu, 14 Jul 2016 18:06:19 +0000 (18:06 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into lmp-dev

8 years agoMerge "DO NOT MERGE Add bound checks to utf16_to_utf8" into lmp-dev
Sergio Giro [Thu, 14 Jul 2016 17:36:23 +0000 (17:36 +0000)]
Merge "DO NOT MERGE Add bound checks to utf16_to_utf8" into lmp-dev

8 years agoDO NOT MERGE Add bound checks to utf16_to_utf8
Sergio Giro [Tue, 28 Jun 2016 17:24:52 +0000 (18:24 +0100)]
DO NOT MERGE Add bound checks to utf16_to_utf8

Bug: 29250543
(cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)

Change-Id: Id4ffb4bee02c3bd53796723b4cbcc88e693f8e83

8 years agoMerge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into klp-dev am: 3242dcf6e9 am...
Robert Shih [Thu, 14 Jul 2016 01:41:18 +0000 (01:41 +0000)]
Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into klp-dev am: 3242dcf6e9 am: f4ad14f154
am: e3c1c2d734  -s ours

Change-Id: I018c8bedc4d810b7abca34ff4273e249ebc0648f

8 years agoMerge \\"DO NOT MERGE - SoftMP3: memset safely\\" into klp-dev am: 3242dcf6e9
Robert Shih [Thu, 14 Jul 2016 01:37:58 +0000 (01:37 +0000)]
Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into klp-dev am: 3242dcf6e9
am: f4ad14f154

Change-Id: Iec5f4a53a3db5fbb40bfecd4bddf4b3f607ae450

8 years agoMerge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:31:29 +0000 (01:31 +0000)]
Merge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev
am: 3242dcf6e9

Change-Id: I09c381c92c7efeacc95c611b2775d875a6202027

8 years agoMerge \\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\" into klp-dev am: 91ad88...
Robert Shih [Thu, 14 Jul 2016 01:28:42 +0000 (01:28 +0000)]
Merge \\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\" into klp-dev am: 91ad8847ab am: 74b10b831c
am: 6bdf8cb440  -s ours

Change-Id: Id01ce97ff7add25f1f0b067440916e9d299a740b

8 years agoMerge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into klp...
Robert Shih [Thu, 14 Jul 2016 01:28:41 +0000 (01:28 +0000)]
Merge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into klp-dev am: f545c72b97 am: d89781f3be
am: c9c40b829f

Change-Id: I5facfd78f7050928d30c86585036128749b1f292

8 years agoMerge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:26:14 +0000 (01:26 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev

8 years agoMerge \\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\" into klp-dev am: 91ad8847ab
Robert Shih [Thu, 14 Jul 2016 01:25:31 +0000 (01:25 +0000)]
Merge \\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\" into klp-dev am: 91ad8847ab
am: 74b10b831c

Change-Id: I2b300c5f4993d4beb866e4f1c94eb4fece1149e2

8 years agoMerge \\"OMXCodec: check IMemory::pointer() before using allocation\\" into klp-dev...
Robert Shih [Thu, 14 Jul 2016 01:25:30 +0000 (01:25 +0000)]
Merge \\"OMXCodec: check IMemory::pointer() before using allocation\\" into klp-dev am: f545c72b97
am: d89781f3be

Change-Id: Iae2cc6d8f4512e7e1f4273bbb28b292337e291b6

8 years agoMerge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev
am: 91ad8847ab

Change-Id: I66eec25f4bc143dd5d67b9bb77825f6e6c732880

8 years agoMerge \"OMXCodec: check IMemory::pointer() before using allocation\" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"OMXCodec: check IMemory::pointer() before using allocation\" into klp-dev
am: f545c72b97

Change-Id: I9206ce86485cb3acc2540d135f6beacc03bb38f5