git.osdn.net Git - android-x86/frameworks-av.git/log

Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]

DO NOT MERGE Fix divide by zero

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 21:01:51 +0000 (21:01 +0000)]

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb am: b617cbed2d am: f5b8755f18 am: 7d5774b0ea
am: 9668a1012a

Change-Id: Ie1550f4ac2417a3bd0cbbfc19f6e4bbb5751f0cb

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 21:01:36 +0000 (21:01 +0000)]

Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605 am: 29ccd8c55d -s ours am: 03bee1989e am: 6c6dd8d9a5 am: e936431c0a
am: fbd7146fcc

Change-Id: Id8549dd45b507760bdc716b6546d0d87651462c2

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:59:18 +0000 (20:59 +0000)]

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb am: b617cbed2d am: f5b8755f18
am: 7d5774b0ea

Change-Id: I1928b55d24e9ed5023af5d68762e1c846388ee62

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:59:06 +0000 (20:59 +0000)]

Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605 am: 29ccd8c55d -s ours am: 03bee1989e am: 6c6dd8d9a5
am: e936431c0a

Change-Id: I6c91733ef133b05b484845ea68891c50bbc0091f

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:56:47 +0000 (20:56 +0000)]

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb am: b617cbed2d
am: f5b8755f18

Change-Id: I0580baa791fa7f87f5e65a47bff20cf1d44334c2

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:56:34 +0000 (20:56 +0000)]

Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605 am: 29ccd8c55d -s ours am: 03bee1989e
am: 6c6dd8d9a5

Change-Id: I60b8d9c769c814b67a636ea8f2f3b451c548f7f6

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:54:21 +0000 (20:54 +0000)]

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb
am: b617cbed2d

Change-Id: Ia289fe9f51200867d38ad92821db2b48532e62e9

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:54:04 +0000 (20:54 +0000)]

Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605 am: 29ccd8c55d -s ours
am: 03bee1989e

Change-Id: I9ebff4e3cb7adace3949c550a74d072c53a18a27

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:52:08 +0000 (20:52 +0000)]

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb
am: 085a4173eb

Change-Id: I0727b58843540b89c4e4668c1e7f2168d5fc7058

commit | commitdiff | tree

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

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:41:43 +0000 (20:41 +0000)]

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc
am: 3fb9e5b7cb

Change-Id: Ibcb0e44db0ff0da658af399522266606171b6a2e

commit | commitdiff | tree

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

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]

Merge "Limit mp4 atom size to something reasonable" into klp-dev
am: 9af51c59dc

Change-Id: Id16a06b7ec4fceac9ecec7ed3504fdf233095268

commit | commitdiff | tree

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

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 20:35:16 +0000 (20:35 +0000)]

Merge "Limit mp4 atom size to something reasonable" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 14:54:32 +0000 (14:54 +0000)]

Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8
am: dffa39ac23

Change-Id: I7f6a1264beac4f08357a5e151ec00abc127e9338

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 14:52:02 +0000 (14:52 +0000)]

Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e
am: db8cfb97c8

Change-Id: I1f204b5117adb467d0883a59b3f1a90f4c10ba47

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 14:49:00 +0000 (14:49 +0000)]

Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c
am: 762b7a9b6e

Change-Id: I63e5846c6a21f03c9063c3d48e49dfe48fb22ea7

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 14:46:30 +0000 (14:46 +0000)]

Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be
am: e353ce4b3c

Change-Id: Iba3ac429600319f099276cc774eb8b3bb85e7b25

commit | commitdiff | tree

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

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 14:41:28 +0000 (14:41 +0000)]

Check mprotect result am: 866c800c06
am: a0cfcf38d4

Change-Id: I0f188e2c717922689df42af21f6c47a865a8c390

commit | commitdiff | tree

Marco Nelissen [Wed, 21 Sep 2016 14:38:58 +0000 (14:38 +0000)]

Check mprotect result
am: 866c800c06

Change-Id: I7b20d72aafb9a95480c1a6b16f0cafc4d1749470

commit | commitdiff | tree

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

commit | commitdiff | tree

Ricardo Garcia [Tue, 20 Sep 2016 02:31:01 +0000 (02:31 +0000)]

Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313 am: 9a5ec6b4c3 am: d959eb23c5 am: 5df594ca92
am: b2c00418d3

Change-Id: I4013cd1ddfabe63e01508ff16777b7abf68f6454

commit | commitdiff | tree

rago [Tue, 20 Sep 2016 02:30:51 +0000 (02:30 +0000)]

Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb am: 2feb9ce748 am: fba2bd1372 am: dddfa37ec9
am: de6acc18bb

Change-Id: I2f722a5271282192b08764a42f28d301be1e1835

commit | commitdiff | tree

Chong Zhang [Tue, 20 Sep 2016 02:30:29 +0000 (02:30 +0000)]

IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee am: 130eb563b8
am: 106a9050b9

Change-Id: Id244e1a1872462d64da300c0c461ee939a8f1f76

commit | commitdiff | tree

Ricardo Garcia [Tue, 20 Sep 2016 01:47:04 +0000 (01:47 +0000)]

Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313 am: 9a5ec6b4c3 am: d959eb23c5
am: 5df594ca92

Change-Id: I25968f125f5fe1a801f23152d04d6d51ef5a322a

commit | commitdiff | tree

rago [Tue, 20 Sep 2016 01:46:42 +0000 (01:46 +0000)]

Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb am: 2feb9ce748 am: fba2bd1372
am: dddfa37ec9

Change-Id: If9c3e7f463b3d053d939f0ca9377dd99dcb5aa4b

commit | commitdiff | tree

Chong Zhang [Tue, 20 Sep 2016 01:46:17 +0000 (01:46 +0000)]

IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9 am: 87415a74ee
am: 130eb563b8

Change-Id: I8a6ee92a0077102d93f6c9e82b5f439f99e4749c

commit | commitdiff | tree

Ricardo Garcia [Tue, 20 Sep 2016 01:27:53 +0000 (01:27 +0000)]

Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313 am: 9a5ec6b4c3
am: d959eb23c5

Change-Id: I9607061992408699810ee2e3da764b249fee5cf1

commit | commitdiff | tree

rago [Tue, 20 Sep 2016 01:27:39 +0000 (01:27 +0000)]

Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb am: 2feb9ce748
am: fba2bd1372

Change-Id: Ic9b0c82b5fa96866efe440d28ba5226c12fa6af1

commit | commitdiff | tree

Chong Zhang [Tue, 20 Sep 2016 01:27:13 +0000 (01:27 +0000)]

IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c am: b308b1a5d9
am: 87415a74ee

Change-Id: If59c75fcee406abe3a2afb1c3e601f7f4b5f8970

commit | commitdiff | tree

Ricardo Garcia [Tue, 20 Sep 2016 00:57:01 +0000 (00:57 +0000)]

Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313
am: 9a5ec6b4c3

Change-Id: I9567b9e3dbd3107cb64ae96681fec0ebb775190f

commit | commitdiff | tree

rago [Tue, 20 Sep 2016 00:56:50 +0000 (00:56 +0000)]

Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb
am: 2feb9ce748

Change-Id: I6a251c81d4337113a863a5364c39006678cca066

commit | commitdiff | tree

Chong Zhang [Tue, 20 Sep 2016 00:56:26 +0000 (00:56 +0000)]

IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c
am: b308b1a5d9

Change-Id: I502080e16a7543aac4b6720283f27b365bac8d52

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

rago [Tue, 20 Sep 2016 00:35:04 +0000 (00:35 +0000)]

Fix potential overflow in Visualizer effect
am: 46dc714d52

Change-Id: I61f5adb793d2c54c078211213b25fd7ea37a3895

commit | commitdiff | tree

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

commit | commitdiff | tree

Ricardo Garcia [Tue, 20 Sep 2016 00:27:26 +0000 (00:27 +0000)]

Merge "Fix potential overflow in Visualizer effect" into klp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Thu, 15 Sep 2016 22:55:00 +0000 (22:55 +0000)]

IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc am: 9a565c52b0 am: daa3b8e3fa am: c47a0e4c71 am: 1f05c699bd
am: 0520fa2f69 -s ours

Change-Id: Iea34d70edea6291c438ee8824dbac960592a57a3

commit | commitdiff | tree

Lajos Molnar [Thu, 15 Sep 2016 22:49:25 +0000 (22:49 +0000)]

IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc am: 9a565c52b0 am: daa3b8e3fa am: c47a0e4c71
am: 1f05c699bd

Change-Id: I9bd9cbf1623de997afddaff4503bc639b6fd158f

commit | commitdiff | tree

Lajos Molnar [Thu, 15 Sep 2016 22:46:54 +0000 (22:46 +0000)]

IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc am: 9a565c52b0 am: daa3b8e3fa
am: c47a0e4c71

Change-Id: I25b1252b6165bb815d6713ca3bce6a17dffdd640

commit | commitdiff | tree

Lajos Molnar [Thu, 15 Sep 2016 22:44:54 +0000 (22:44 +0000)]

IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc am: 9a565c52b0
am: daa3b8e3fa

Change-Id: I163ffc7bb0b794af540653614be05abfe2fb828e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Mon, 12 Sep 2016 21:40:47 +0000 (14:40 -0700)]

IOMX: restrict conversion of ANWB to gralloc source in emptyBuffer

This is only allowed in-process (if backup and codec buffers are
connected.)

Bug: 29422020
Bug: 31412859
Change-Id: If48e3e0b6f1af99a459fdc3f6f03744bbf0dc375

commit | commitdiff | tree

Lajos Molnar [Wed, 14 Sep 2016 17:01:37 +0000 (10:01 -0700)]

commit | commitdiff | tree

Eric Laurent [Tue, 13 Sep 2016 23:22:18 +0000 (23:22 +0000)]

Merge "SoundTrigger: get service by value." into lmp-dev am: d9288b85b3 am: 1382a3a869 am: e18f3154be
am: 867bfdd16f

Change-Id: I0fb6528090259961e22658dbada63eacf28f99aa

commit | commitdiff | tree

Eric Laurent [Tue, 13 Sep 2016 23:22:18 +0000 (23:22 +0000)]

SoundTrigger: get service by value. am: 3b01b3019b am: bd33d5672f am: 9b5b4abd82
am: 4a34d9fcd2

Change-Id: I51848846811a770346189dcaed080f2cf350883a

commit | commitdiff | tree

Eric Laurent [Tue, 13 Sep 2016 23:19:10 +0000 (23:19 +0000)]

Merge "SoundTrigger: get service by value." into lmp-dev am: d9288b85b3 am: 1382a3a869
am: e18f3154be

Change-Id: If45be58ebdc2378781bb2571ea748f2858a71e1d

commit | commitdiff | tree

Eric Laurent [Tue, 13 Sep 2016 23:19:09 +0000 (23:19 +0000)]

SoundTrigger: get service by value. am: 3b01b3019b am: bd33d5672f
am: 9b5b4abd82

Change-Id: I2574013b83d43208f07812dd4b3e431805e2a6e3

commit | commitdiff | tree

Eric Laurent [Tue, 13 Sep 2016 23:16:41 +0000 (23:16 +0000)]

Merge "SoundTrigger: get service by value." into lmp-dev am: d9288b85b3
am: 1382a3a869

Change-Id: Iff9cdece93d788ec081e95d68b0470dd42d338ab

commit | commitdiff | tree

Eric Laurent [Tue, 13 Sep 2016 23:16:40 +0000 (23:16 +0000)]

SoundTrigger: get service by value. am: 3b01b3019b
am: bd33d5672f

Change-Id: I02848bd715ac17b90728d867242889749ff39f61

commit | commitdiff | tree

Eric Laurent [Tue, 13 Sep 2016 23:13:41 +0000 (23:13 +0000)]

Merge "SoundTrigger: get service by value." into lmp-dev
am: d9288b85b3

Change-Id: Ic8cd8682688c8363420e768996c13af072f61182

commit | commitdiff | tree

Eric Laurent [Tue, 13 Sep 2016 23:13:40 +0000 (23:13 +0000)]

SoundTrigger: get service by value.
am: 3b01b3019b

Change-Id: Ibb98c945e51fef6d21e91b1e9f670eb4f83c5663

commit | commitdiff | tree

Eric Laurent [Tue, 13 Sep 2016 23:04:34 +0000 (23:04 +0000)]

Merge "SoundTrigger: get service by value." into lmp-dev

commit | commitdiff | tree

Eric Laurent [Wed, 7 Sep 2016 23:58:39 +0000 (16:58 -0700)]

Radio: 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: Iae838b3b672562c1d0cd63968399a6bfdda7f5ab

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:14:18 +0000 (17:14 +0000)]

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be am: 56100a30ba -s ours am: 563b100957 -s ours am: 4636e7256a am: 44071d00a7
am: f95caa3506 -s ours

Change-Id: I0a92cd56f3a63f0eedc3667de098fef967fdd5c8

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:14:18 +0000 (17:14 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d am: c5251a627c -s ours am: 18f84821f6 -s ours am: a6d4a2a14c am: 6048921526
am: 638ae0ac2c -s ours

Change-Id: I0e6c25097a34af0f7881ce5a766d4583d3c3b9c0

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:11:21 +0000 (17:11 +0000)]

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be am: 56100a30ba -s ours am: 563b100957 -s ours am: 4636e7256a
am: 44071d00a7

Change-Id: I77cec5a8c8de37ea691fc0e2ba81a3dc641528d8

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:11:20 +0000 (17:11 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d am: c5251a627c -s ours am: 18f84821f6 -s ours am: a6d4a2a14c
am: 6048921526

Change-Id: Idcb4748385bffd0dfa2913e8c738f5d27c50b3ed

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:08:18 +0000 (17:08 +0000)]

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be am: 56100a30ba -s ours am: 563b100957 -s ours
am: 4636e7256a

Change-Id: I8785b7aaee1c5d7b5061faa32c2b86b9f34f2339

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:08:17 +0000 (17:08 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d am: c5251a627c -s ours am: 18f84821f6 -s ours
am: a6d4a2a14c

Change-Id: I5d20ea6b5fbbf2b1e3fb698a6f9ada8361b38f73

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:05:33 +0000 (17:05 +0000)]

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am: 6981afc6ac -s ours am: efd392db1d am: d4b1c832c9
am: 0748e8945e -s ours

Change-Id: Ief4bd9419931bd2a1158445d110b313c8a777af7

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:05:32 +0000 (17:05 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 86369364a0 -s ours am: 97f82679d8 am: 2815b127e0
am: 8eca7511cc -s ours

Change-Id: I0f5df98f733c64d4e4ab6761c0f85574561aafd2

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:05:30 +0000 (17:05 +0000)]

Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19 am: 4e3aea6a85
am: 4390796eeb

Change-Id: If65018427bcdce6e6faec5c42f53d1ae9e99cc28

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:05:24 +0000 (17:05 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 9a4768f7bf am: da3cba194b
am: 61bb7a0d99 -s ours

Change-Id: I3174f611aade730cbb2cbf9f4daaa01b5f665fc3

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:05:18 +0000 (17:05 +0000)]

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be am: 56100a30ba -s ours
am: 563b100957 -s ours

Change-Id: I00e5d507d17dbd98d04809e08d29f8b635a1642f

commit | commitdiff | tree

Wonsik Kim [Fri, 9 Sep 2016 17:05:18 +0000 (17:05 +0000)]

DO NOT MERGE omx: check buffer port before using am: 0e2cc67785 am: 5dd07a6ef3
am: beb7008c2e -s ours

Change-Id: Ie44e05eea9e40d81de9f615422ced307282c9868

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:05:17 +0000 (17:05 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d am: c5251a627c -s ours
am: 18f84821f6 -s ours

Change-Id: I6de1712821d83e87de98d3f7a16d1b73d658cf22

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:02:18 +0000 (17:02 +0000)]

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am: 6981afc6ac -s ours am: efd392db1d
am: d4b1c832c9

Change-Id: I3a58ea5c113f24ca9d86a0d49d9bddff30be6a5c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:00:57 +0000 (17:00 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 86369364a0 -s ours am: 97f82679d8
am: 2815b127e0

Change-Id: I3a5e9d6c41982e0e0a8f8ca50202c6c45a92cf45

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:00:55 +0000 (17:00 +0000)]

Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19
am: 4e3aea6a85

Change-Id: Icae83108c9c067b5926178ef0e0150a287ac7d33

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:00:44 +0000 (17:00 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 9a4768f7bf
am: da3cba194b

Change-Id: I018340e57d237e4d36d68e2cd118336242447b9c

commit | commitdiff | tree

Wonsik Kim [Fri, 9 Sep 2016 17:00:38 +0000 (17:00 +0000)]

DO NOT MERGE omx: check buffer port before using am: 0e2cc67785
am: 5dd07a6ef3

Change-Id: I3b95ef380f380dac23aaf97be96630ca8bef552c

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 17:00:32 +0000 (17:00 +0000)]

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am: 6981afc6ac -s ours
am: efd392db1d

Change-Id: I8281b233acd6ff226964b7d8b9a5702cf74d18cd

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 16:59:45 +0000 (16:59 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 86369364a0 -s ours
am: 97f82679d8

Change-Id: I135260d20085f49a9dd3dafd83d76e4408a8f33e

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]

Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev
am: 6981afc6ac -s ours

Change-Id: I1987358c9b524bc1bd3863f0653947ba7d09407e

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing
am: 86369364a0 -s ours

Change-Id: Ic53907aae24e4238e64a269cd957a0947cc18491

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 16:54:43 +0000 (16:54 +0000)]

Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev
am: 7c36c95b19

Change-Id: I6b2c80df71e7b131ada618141db3cdec37d9e587

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 16:54:42 +0000 (16:54 +0000)]

DO NOT MERGE: IOMX: work against metadata buffer spoofing
am: 9a4768f7bf

Change-Id: Ib611c8e1abdff62df4f8067c1bb7a5e2dd18c328

commit | commitdiff | tree

Wonsik Kim [Fri, 9 Sep 2016 16:54:37 +0000 (16:54 +0000)]

DO NOT MERGE omx: check buffer port before using
am: 0e2cc67785

Change-Id: Ie5692f86d9cbb0b2c890517b6f5f1b0db1e7c281

commit | commitdiff | tree

Lajos Molnar [Fri, 9 Sep 2016 16:52:15 +0000 (16:52 +0000)]

Merge "IOMX: work against metadata buffer spoofing" into mnc-dev