OSDN Git Service

android-x86/frameworks-av.git
7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf
Marco Nelissen [Mon, 15 May 2017 16:56:55 +0000 (16:56 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf
am: 086cee9d89

Change-Id: I9687649ed25dade9f872c83a290bbcd0abb4b5fc

7 years agoLimit ogg packet size am: bf928560ac
Marco Nelissen [Mon, 15 May 2017 16:53:54 +0000 (16:53 +0000)]
Limit ogg packet size am: bf928560ac
am: f349435fcf

Change-Id: I952944295017f01b254c80c8db935e33c51337f3

7 years agoLimit ogg packet size
Marco Nelissen [Mon, 15 May 2017 16:50:55 +0000 (16:50 +0000)]
Limit ogg packet size
am: bf928560ac

Change-Id: I102f6e9b1b4933d043b2a3e1e3f7fc885aaf6779

7 years agoLimit ogg packet size
Marco Nelissen [Fri, 12 May 2017 22:35:30 +0000 (15:35 -0700)]
Limit ogg packet size

A malformed ogg file might lace together a very large packet, which
could lead to out of memory conditions. Limit the packet size to
avoid this.

Bug: 36592202
Change-Id: I8650b3ec54a0de9ec302a7cbac296bb85efcfb3d

7 years agoMerge "Avoid crash for stss sync sample number 0" into lmp-dev
TreeHugger Robot [Tue, 11 Apr 2017 17:02:45 +0000 (17:02 +0000)]
Merge "Avoid crash for stss sync sample number 0" into lmp-dev

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:36:33 +0000 (20:36 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e am: 0893c50bcf
am: 59bc7f77f8

Change-Id: I133f8566b649821e06cfb21a95b20f84eb839219

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:32:06 +0000 (20:32 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev am: 922ad6183e
am: 0893c50bcf

Change-Id: I819b55a95ff50c51488bac50c43fea8b2244a410

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 20:27:43 +0000 (20:27 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev
am: 922ad6183e

Change-Id: I8fbd67b5fe298d6f842d224109e2ab0b52a2b59a

7 years agoMerge "Don't allow using or allocating a buffer after the first state transition...
Marco Nelissen [Mon, 10 Apr 2017 19:57:08 +0000 (19:57 +0000)]
Merge "Don't allow using or allocating a buffer after the first state transition" into klp-dev

7 years agoAvoid crash for stss sync sample number 0
Roger1 Jonsson [Wed, 26 Oct 2016 07:20:00 +0000 (09:20 +0200)]
Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
bug: 35645051
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d
Roger1 Jonsson [Wed, 5 Apr 2017 23:07:37 +0000 (23:07 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3 am: e77a32bd3d
am: ab28d49e41  -s ours

Change-Id: I63e6f4ea65dda85e5d779f6aaf1fbd4ca5806f8c

7 years agoAvoid crash for stss sync sample number 0 am: 5c364997a3
Roger1 Jonsson [Wed, 5 Apr 2017 22:52:35 +0000 (22:52 +0000)]
Avoid crash for stss sync sample number 0 am: 5c364997a3
am: e77a32bd3d

Change-Id: If61ba19bc937c6b7c7227296ddba5a1797072f9d

7 years agoAvoid crash for stss sync sample number 0
Roger1 Jonsson [Wed, 5 Apr 2017 22:49:34 +0000 (22:49 +0000)]
Avoid crash for stss sync sample number 0
am: 5c364997a3

Change-Id: Ia97daf543c65b52db1c5d09471ed8d00a434364d

7 years agoAvoid crash for stss sync sample number 0
Roger1 Jonsson [Wed, 26 Oct 2016 07:20:00 +0000 (09:20 +0200)]
Avoid crash for stss sync sample number 0

A sample number value of 0 means that the value stored in
the mSyncSamples array, would become negative (-1),
when converted to index value. This causes a crash.

Make sure that stss sample numbers are bigger
than 0 before converting sample number to index value.

Bug: 32423862
bug: 35645051
Test: Playback video that triggers stss sync sample number 0
Change-Id: I35bee7c718e01b086d7e05deda13b38083f509f5

7 years agoDon't allow using or allocating a buffer after the first state transition
Marco Nelissen [Mon, 27 Mar 2017 22:04:25 +0000 (15:04 -0700)]
Don't allow using or allocating a buffer after the first state transition

Bug: 35467458
Change-Id: Ia76c8cec8ad2abb95ca29b2a89075f7acab4b174

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd
Robert Shih [Tue, 14 Mar 2017 23:54:28 +0000 (23:54 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0 am: 761abda1bd
am: aca26c9d45  -s ours

Change-Id: Id436554a36de729ccd7a3220e32e155c423d0531

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0
Robert Shih [Tue, 14 Mar 2017 23:49:57 +0000 (23:49 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer am: 13c77f4fe0
am: 761abda1bd

Change-Id: I30bf5233b69619d260edb952248865adf5c55c83

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer
Robert Shih [Tue, 14 Mar 2017 23:45:27 +0000 (23:45 +0000)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer
am: 13c77f4fe0

Change-Id: Ib7f8b77b3ba27fcd8e61e540eb39259cb287185c

7 years agoFLACExtractor: copy protect mWriteBuffer
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
FLACExtractor: copy protect mWriteBuffer

Bug: 30895578
Bug: 34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431
(cherry picked from commit 328cd66cc72ba7bc5452ed5a93f29ddcd73aa9f9)

7 years agoDO NOT MERGE FLACExtractor: copy protect mWriteBuffer
Robert Shih [Mon, 24 Oct 2016 18:38:31 +0000 (11:38 -0700)]
DO NOT MERGE FLACExtractor: copy protect mWriteBuffer

Bug: 30895578
Bug: 34970788
Change-Id: I4cba36bbe3502678210e5925181683df9726b431

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af...
Ray Essick [Mon, 13 Mar 2017 22:52:42 +0000 (22:52 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752 am: 8e3cf4d841
am: 5b1bfc1f43

Change-Id: I32327162d3e69259656f0b3a82800f45572527fd

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f...
Ray Essick [Mon, 13 Mar 2017 22:52:28 +0000 (22:52 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe
am: f5c7784dbd

Change-Id: Ic1901b3fa14a1e1c7f582e5b7862e777489e7314

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752
Ray Essick [Mon, 13 Mar 2017 22:48:10 +0000 (22:48 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752
am: 8e3cf4d841

Change-Id: I804c61a21202d3c5aef3edac5872f56cef67753b

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f
Ray Essick [Mon, 13 Mar 2017 22:47:56 +0000 (22:47 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f
am: dcda2ec2fe

Change-Id: I6759f0d478dd70baf59c3e006cb904d26793c1d4

7 years agoMerge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2...
Marco Nelissen [Mon, 13 Mar 2017 22:43:54 +0000 (22:43 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6
am: c2e69851ea

Change-Id: I2720c4439848f9aab8d7fa4f93b548793d129a4f

7 years agoMerge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938
Marco Nelissen [Mon, 13 Mar 2017 22:43:40 +0000 (22:43 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e am: 9e8dfb5938
am: 9e4a0e1fab

Change-Id: I17a5c0765c31c92a25e7c89a330aa656adc03baf

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev
Ray Essick [Mon, 13 Mar 2017 22:43:39 +0000 (22:43 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev
am: 19b91af752

Change-Id: I83ad1fa809b82d1b4a6158b66ebffc5ae1d35590

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev
Ray Essick [Mon, 13 Mar 2017 22:43:27 +0000 (22:43 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev
am: 2076915c5f

Change-Id: Ib9bc5c92218231acefda2800df84a8bffe2da92f

7 years agoMerge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8
Marco Nelissen [Mon, 13 Mar 2017 22:43:26 +0000 (22:43 +0000)]
Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c am: f71b76cae8
am: 36c2e14da3

Change-Id: Ie6d46a6979bc89e2485fa4d2a25b21fc601e9783

7 years agoMerge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0
Marco Nelissen [Mon, 13 Mar 2017 22:39:25 +0000 (22:39 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0
am: bbca2719c6

Change-Id: If5ae485e1be0df3d4f61edf689d5b4c1520077b8

7 years agoMerge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e
Marco Nelissen [Mon, 13 Mar 2017 22:39:10 +0000 (22:39 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev am: 012e5fd39e
am: 9e8dfb5938

Change-Id: I875cb7bba1bc6f6f443923a04629ae44a9d41140

7 years agoMerge "Fix out of bounds access" into klp-dev am: 360cbbd72c
Marco Nelissen [Mon, 13 Mar 2017 22:38:56 +0000 (22:38 +0000)]
Merge "Fix out of bounds access" into klp-dev am: 360cbbd72c
am: f71b76cae8

Change-Id: I3306be5d7bb3867287732757dd14170527488b68

7 years agoMerge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev
Ray Essick [Mon, 13 Mar 2017 22:38:40 +0000 (22:38 +0000)]
Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev

7 years agoMerge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev
Ray Essick [Mon, 13 Mar 2017 22:35:43 +0000 (22:35 +0000)]
Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev

7 years agoMerge "Fix integer overflow and divide-by-zero" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:34:54 +0000 (22:34 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev
am: b264ece2c0

Change-Id: Id65ef33cb965b6fbdec95d9429ee05b134fd14f3

7 years agoMerge "Fix NPDs in h263 decoder" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:34:40 +0000 (22:34 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev
am: 012e5fd39e

Change-Id: I2ad3e1364472558cf48c51fb3e2a08002d74c32d

7 years agoMerge "Fix out of bounds access" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:34:26 +0000 (22:34 +0000)]
Merge "Fix out of bounds access" into klp-dev
am: 360cbbd72c

Change-Id: I9ea32d31b1281689c4b5997a6c328630031c1795

7 years agoMerge "Fix integer overflow and divide-by-zero" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:31:24 +0000 (22:31 +0000)]
Merge "Fix integer overflow and divide-by-zero" into klp-dev

7 years agoMerge "Fix NPDs in h263 decoder" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:30:25 +0000 (22:30 +0000)]
Merge "Fix NPDs in h263 decoder" into klp-dev

7 years agoMerge "Fix out of bounds access" into klp-dev
Marco Nelissen [Mon, 13 Mar 2017 22:28:40 +0000 (22:28 +0000)]
Merge "Fix out of bounds access" into klp-dev

7 years agoAdd bounds check in SoftAACEncoder2::onQueueFilled()
Ray Essick [Mon, 13 Mar 2017 18:59:57 +0000 (11:59 -0700)]
Add bounds check in SoftAACEncoder2::onQueueFilled()

Original code blindly copied some header information into the
user-supplied buffer without checking for sufficient space.
The code does check when it gets to filling the data -- it's
just the header copies that weren't checked.

Bug: 34617444
Test: ran POC before/after
Change-Id: I6e80ec90616f6cd02bb8316cd2d6e309b7e4729d

7 years agoFix NPDs in h263 decoder
Marco Nelissen [Fri, 3 Mar 2017 21:37:27 +0000 (13:37 -0800)]
Fix NPDs in h263 decoder

Bug: 35269635
Test: decoded PoC with and without patch
Change-Id: I636a14360c7801cc5bca63c9cb44d1d235df8fd8

7 years agoFix TOCTOU problem in libstagefright_soft_aacenc
Ray Essick [Sat, 11 Mar 2017 00:03:40 +0000 (16:03 -0800)]
Fix TOCTOU problem in libstagefright_soft_aacenc

Fixes a configuration error where we sized a buffer initially based
on the configuration at the time and held onto the buffer through the
rest of our lifetime. If the configuration was changed in a way that
resulted in needing a different size buffer, the code did not make
this happen.

Patch keeps the buffer around but also stores the 'current allocation
size'.  This allows the later code that preps the buffer to query if
the buffer size is same or changed.  If changed, we discard the old
buffer and allocate a new one of the appropriate size.

safetynet logging added so we can tell how often this happens in the
field.

Testing was done on nyc-mr2 (where poc was built). Patch applies
without change to k/l/m/n/master.

Bug: 34621073
Test: run POC, saw new diagnostics saying it caught the size change.
Change-Id: Ia95aadc8c727434b7ba9628deeae327c405336d3

7 years agoFix out of bounds access
Marco Nelissen [Fri, 10 Mar 2017 19:28:44 +0000 (11:28 -0800)]
Fix out of bounds access

Bug: 34618607
Change-Id: I84f0ef948414d0b2d54e8948b6c30b8ae4da2b36

7 years agoMerge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track"...
Andy Hung [Fri, 10 Mar 2017 22:39:58 +0000 (22:39 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am: e0da30dc57 am: 737754e97a
am: de6072164a  -s ours

Change-Id: I33a81bea7f8e210dbadade3f9bd63a3decbfb478

7 years agoMerge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track"...
Andy Hung [Fri, 10 Mar 2017 22:36:28 +0000 (22:36 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am: e0da30dc57
am: 737754e97a

Change-Id: Ide9fb3f4955a31ade22f99c299f441d8413c1b88

7 years agoMerge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track"...
Andy Hung [Fri, 10 Mar 2017 22:32:59 +0000 (22:32 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev
am: e0da30dc57

Change-Id: Ia8aee821949f27b81e5c0ddca2e39aa9e478a432

7 years agoMerge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track"...
Andy Hung [Fri, 10 Mar 2017 22:29:51 +0000 (22:29 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev

7 years agoMerge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev
Andy Hung [Fri, 10 Mar 2017 22:29:43 +0000 (22:29 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev

7 years agoFix integer overflow and divide-by-zero
Marco Nelissen [Thu, 9 Mar 2017 23:01:55 +0000 (15:01 -0800)]
Fix integer overflow and divide-by-zero

Bug: 35763994
Test: ran CTS with and without fix
Change-Id: If835e97ce578d4fa567e33e349e48fb7b2559e0e

7 years agoDO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503
Wonsik Kim [Thu, 16 Feb 2017 01:34:50 +0000 (01:34 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503
am: daaabdcaac  -s ours

Change-Id: I20ff9fb7d3d5f3be5e9c21d0335ed15844a5dd15

7 years agoDO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e
Wonsik Kim [Thu, 16 Feb 2017 01:31:19 +0000 (01:31 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e
am: afaa438503

Change-Id: Ife5d8803e38a6d62f820929c6eb83b93f8ec64c1

7 years agoDO NOT MERGE codecs: handle onReset() for a few encoders
Wonsik Kim [Thu, 16 Feb 2017 01:28:51 +0000 (01:28 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders
am: dd447c354e

Change-Id: I0f2bde22c3e3b19d364ffce46f2e7c67f4016d75

7 years agocodecs: handle onReset() for a few encoders
Wonsik Kim [Fri, 10 Feb 2017 05:29:40 +0000 (14:29 +0900)]
codecs: handle onReset() for a few encoders

Test: Run PoC binaries
Bug: 34749392
Bug: 34705519
Change-Id: I3356eb615b0e79272d71d72578d363671038c6dd

7 years agoDO NOT MERGE codecs: handle onReset() for a few encoders
Wonsik Kim [Fri, 10 Feb 2017 05:29:40 +0000 (14:29 +0900)]
DO NOT MERGE codecs: handle onReset() for a few encoders

Test: Run PoC binaries
Bug: 34749392
Bug: 34705519
Change-Id: I3356eb615b0e79272d71d72578d363671038c6dd

7 years agoDO NOT MERGE AudioFlinger: Check framecount overflow when creating track
Andy Hung [Tue, 14 Feb 2017 02:48:39 +0000 (18:48 -0800)]
DO NOT MERGE AudioFlinger: Check framecount overflow when creating track

Test: Native POC
Bug: 34749571
Change-Id: I7529658e52ac7e64d162eb5338f10fb25eaa8fe7

7 years agoAudioFlinger: Check framecount overflow when creating track
Andy Hung [Tue, 14 Feb 2017 02:48:39 +0000 (18:48 -0800)]
AudioFlinger: Check framecount overflow when creating track

Test: Native POC
Bug: 34749571
Change-Id: I7529658e52ac7e64d162eb5338f10fb25eaa8fe7
(cherry picked from commit 1883f69de5f2c4e71df58d5b71d7c39f9779b50c)

7 years agoEffectBundle: check nb channels to write speaker angles
Jean-Michel Trivi [Tue, 14 Feb 2017 00:31:20 +0000 (16:31 -0800)]
EffectBundle: check nb channels to write speaker angles

When speaker angles are queried, the size of the array for the
  returned data is 3x the number of channels (where really it
  should be max(2, nbChannels)). The code assumed it was at
  least 3x2 (where 2 is the number of virtual speakers this
  effect supports) and would thus crash when called for a mono
  channel mask.

Test: see repro steps in bug
Bug: 32591350
Change-Id: I33d4bff6b2e19a9fc4284a85a446804878d3a410

7 years agoMerge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am:...
Marco Nelissen [Mon, 13 Feb 2017 21:46:48 +0000 (21:46 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764
am: 7f3980c0ca

Change-Id: Iaa2a11e1924fdcfe83ca8c8e9a7925850ceb53be

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff...
Marco Nelissen [Mon, 13 Feb 2017 21:46:33 +0000 (21:46 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58
am: 7902138f2e

Change-Id: I2d9be870193a986d9cd21d7527c4069cd1f184ed

7 years agoMerge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce
Marco Nelissen [Mon, 13 Feb 2017 21:43:48 +0000 (21:43 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce
am: e541fa1764

Change-Id: Ia2962471693b1c4302d4535a0f95dd8d914c3cb8

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d
Marco Nelissen [Mon, 13 Feb 2017 21:43:31 +0000 (21:43 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d
am: 86bd734f58

Change-Id: I3729ea0064642ac10292561d450565ee735af369

7 years agoMerge "Fix overflow check and check read result" into klp-dev
Marco Nelissen [Mon, 13 Feb 2017 21:41:14 +0000 (21:41 +0000)]
Merge "Fix overflow check and check read result" into klp-dev
am: b6aa3901ce

Change-Id: I80ef33d8f0593fa723077e91a5ca406f27b0b746

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev
Marco Nelissen [Mon, 13 Feb 2017 21:40:59 +0000 (21:40 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev
am: 65433ff04d

Change-Id: I6be526b6ed9df22c9699445efaa4f0ed2ae266b4

7 years agoMerge "Fix overflow check and check read result" into klp-dev
Marco Nelissen [Mon, 13 Feb 2017 21:36:48 +0000 (21:36 +0000)]
Merge "Fix overflow check and check read result" into klp-dev

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev
Marco Nelissen [Mon, 13 Feb 2017 21:35:18 +0000 (21:35 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev

7 years agoFix overflow check and check read result
Marco Nelissen [Mon, 6 Feb 2017 22:12:30 +0000 (14:12 -0800)]
Fix overflow check and check read result

Bug: 33861560
Test: build
Change-Id: Ia85519766e19a6e37237166f309750b3e8323c4e

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
Eino-Ville Talvala [Thu, 2 Feb 2017 23:52:04 +0000 (23:52 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f
am: f0009384d8

Change-Id: I8efab658bd67af7eb85ac8cd6dc7d6d9fa61ef21

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb
Eino-Ville Talvala [Thu, 2 Feb 2017 23:52:01 +0000 (23:52 +0000)]
CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb
am: 8806c2a11d

Change-Id: I61be9ab0dbd9acde84811cd437304267b9544099

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96
Eino-Ville Talvala [Thu, 2 Feb 2017 23:49:04 +0000 (23:49 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96
am: 4fca12e56f

Change-Id: I082c1ec76a3b05de211d169ee07a7a1f544081dc

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12
Eino-Ville Talvala [Thu, 2 Feb 2017 23:49:01 +0000 (23:49 +0000)]
CameraBase: Don't return an sp<> by reference am: 4b49489c12
am: 8c32699ceb

Change-Id: I6fac31b3eaa435a665643343c2a6d8a6959be107

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev
Eino-Ville Talvala [Thu, 2 Feb 2017 23:47:02 +0000 (23:47 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev
am: fdf64bab96

Change-Id: Ied7016c8cfaaa0d7ed714f753b8827cf0179cb1a

7 years agoCameraBase: Don't return an sp<> by reference
Eino-Ville Talvala [Thu, 2 Feb 2017 23:47:01 +0000 (23:47 +0000)]
CameraBase: Don't return an sp<> by reference
am: 4b49489c12

Change-Id: I4befb08a206d22e71a6ab2bfd44fb90ddbd62915

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev
Eino-Ville Talvala [Thu, 2 Feb 2017 23:42:07 +0000 (23:42 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:28:50 +0000 (21:28 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f
am: ce9cab33b7

Change-Id: Id9318840db48994196c72eb5f14e132e23776bda

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e
Marco Nelissen [Thu, 2 Feb 2017 21:26:19 +0000 (21:26 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e
am: aa5498018f

Change-Id: Ica9690b213037f6bd4c13bf14a4d66b77b7def41

7 years agoRevert "Turn off overflow protection for various math functions"
Marco Nelissen [Thu, 2 Feb 2017 21:24:19 +0000 (21:24 +0000)]
Revert "Turn off overflow protection for various math functions"
am: 2dd1d5e02e

Change-Id: I37734de98f269e6886be0578b4ff9db31229c8de

7 years agoRevert "Turn off overflow protection for various math functions"
Marco Nelissen [Thu, 2 Feb 2017 20:53:17 +0000 (20:53 +0000)]
Revert "Turn off overflow protection for various math functions"

This reverts commit cbf5e6915c42c691a6ccb9a5d249e450f9e67467.

Change-Id: I0a81c26d22fee36485b21c285dcc91fbd518e1dd

7 years agoCameraBase: Don't return an sp<> by reference
Eino-Ville Talvala [Wed, 1 Feb 2017 23:27:41 +0000 (15:27 -0800)]
CameraBase: Don't return an sp<> by reference

If the server dies, the binder death callback clears out
the global camera service sp<>, and any current references to it
will become quite unhappy.

Test: Camera CTS passes
Bug: 31992879
Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49
Marco Nelissen [Thu, 2 Feb 2017 19:36:52 +0000 (19:36 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49
am: a25eb35608

Change-Id: Ia0f2f794297ab8b4c5070e5948c748d0265aa54b

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c
Marco Nelissen [Thu, 2 Feb 2017 19:34:21 +0000 (19:34 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c
am: 72b1fdbf49

Change-Id: I46daf840866183690f27ff7b3e6ed7ffe8bec9f5

7 years agoTurn off overflow protection for various math functions
Marco Nelissen [Thu, 2 Feb 2017 19:31:52 +0000 (19:31 +0000)]
Turn off overflow protection for various math functions
am: cbf5e6915c

Change-Id: Iee62ce7ef71208e30d9ee7b98342163bfc997779

7 years agoTurn off overflow protection for various math functions
Marco Nelissen [Wed, 1 Feb 2017 23:35:35 +0000 (15:35 -0800)]
Turn off overflow protection for various math functions

These functions also exist as arm assembly files, where the overflows
just wrap around, and this makes their plain C equivalents behave
the same.

Bug: 32577290
Bug: 33071964
Test: ran PoC for bug 32577290 using plain C source code
Change-Id: I73c2609589e7a89d36f6c44391548312259daf14

7 years agoavc_utils: skip empty NALs from malformed bistreams
Robert Shih [Wed, 25 Jan 2017 02:08:59 +0000 (18:08 -0800)]
avc_utils: skip empty NALs from malformed bistreams

Avoid a CHECK and make it the decoder's repsonsibility to handle a
malformed bistream gracefully.

Bug: 34509901
Bug: 33137046
Test: StagefrightTest#testStagefright_bug_27855419_CVE_2016_2463
Change-Id: I2d94f8da63d65a86a9c711c45546e4c695e0f3b4

7 years agostagefright: parseApp check data boundary conditions
Mark Salyzyn [Mon, 23 Jun 2014 21:13:22 +0000 (14:13 -0700)]
stagefright: parseApp check data boundary conditions

Test: compile, no poc for boundary violation.
Bug: 34056274
Change-Id: I23f5ccba8f211e01d9a3a741c8ea537b55aab4e2

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e
Marco Nelissen [Tue, 17 Jan 2017 19:06:56 +0000 (19:06 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e
am: 0a4db601b4

Change-Id: I46806d03da614119b805087d995f8f40c70ee3b2

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc
Marco Nelissen [Tue, 17 Jan 2017 18:46:50 +0000 (18:46 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc
am: acb7186e6e

Change-Id: I9af93746702bb746a48420dbb03fc29878ef730f

7 years agoDon't CHECK when buffer is too large
Marco Nelissen [Tue, 17 Jan 2017 18:27:32 +0000 (18:27 +0000)]
Don't CHECK when buffer is too large
am: c2f0c73bfc

Change-Id: Ibcc5b7a28092fdcba5082b956e3bbdb0fc2d3f4a

7 years agoDon't initialize sync sample parameters until the end
Marco Nelissen [Thu, 12 Jan 2017 23:49:04 +0000 (15:49 -0800)]
Don't initialize sync sample parameters until the end

to avoid leaving them in a partially initialized state.

Bug: 33137046
Test: ran CTS tests
Change-Id: I1f5c070233c5917d85da9e930e01a3fc51a0a0ec

7 years agoDon't CHECK when buffer is too large
Marco Nelissen [Fri, 6 Jan 2017 21:57:51 +0000 (13:57 -0800)]
Don't CHECK when buffer is too large

Bug: 31647370
Test: ran CTS test with and without patch
Change-Id: I4e3a37aabc9387432671c1c0c469241142612cc4

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:20:47 +0000 (22:20 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73
am: 73a152960b  -s ours

Change-Id: Id10c17b4bbdc1dd90a1cad25b6c697f8b6a0bcd0

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107
Eric Laurent [Wed, 4 Jan 2017 22:17:58 +0000 (22:17 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107
am: 26cf2f4d73

Change-Id: I6513190cce6756c47e5ede0dc578fa0d2c5889b3

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Wed, 4 Jan 2017 22:15:29 +0000 (22:15 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am: b47a5ab107

Change-Id: I46af7560653784852e771a2eefd581989aac0644

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE - improve audio effect framwework thread safety

- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.
- Check reply size before writing status in EffectHandle::command()

Bug: 32707507
Bug: 32095713
Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE - improve audio effect framwework thread safety

- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.
- Check reply size before writing status in EffectHandle::command()

Bug: 32707507
Bug: 32095713

Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:40:47 +0000 (00:40 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e
am: 94d5167a91

Change-Id: I3a4af7a28adcd54d4590f447845b134acb80f053

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f
Andy Hung [Sat, 3 Dec 2016 00:40:33 +0000 (00:40 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f
am: 9851dee7da

Change-Id: I3d375c671122e61cf0b530457c37c1cd5c06e563

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c
Andy Hung [Sat, 3 Dec 2016 00:38:50 +0000 (00:38 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c
am: 308e51173e

Change-Id: I7d741aa81543b95a6c3aeada9a259ba5a4c9b5bb

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92
Andy Hung [Sat, 3 Dec 2016 00:38:33 +0000 (00:38 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92
am: 82c8c7656f

Change-Id: I8819bc1146b0b751abc0790edd4b7d73f2198038

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev
Andy Hung [Sat, 3 Dec 2016 00:36:02 +0000 (00:36 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev
am: 1576f5968c

Change-Id: I3310e7efeb0bcd1826d112e94e13f46ce5234755