OSDN Git Service

android-x86/frameworks-av.git
9 years agoam bcc8e581: am bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am...
Joshua J. Drake [Fri, 7 Aug 2015 16:29:35 +0000 (16:29 +0000)]
am bcc8e581: am bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit 'bcc8e5817fa3dc624f214e58f756098053ac5682':
  Fix integer overflow when handling MPEG4 tx3g atom

9 years agoam a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev...
Nick Kralevich [Fri, 7 Aug 2015 16:29:34 +0000 (16:29 +0000)]
am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

* commit 'a421314f9cc1b061d94a79e2aa1a92916ea4b9bf':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am...
Joshua J. Drake [Fri, 7 Aug 2015 16:17:10 +0000 (16:17 +0000)]
am bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit 'bb99a362dc76f9bf040f6256369fabf27ad1c2f5':
  Fix integer overflow when handling MPEG4 tx3g atom

9 years agoam 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp
Nick Kralevich [Fri, 7 Aug 2015 16:13:44 +0000 (16:13 +0000)]
am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

* commit '430475da7f0edb86ee6a85378d1583ab07f7f93d':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix...
Joshua J. Drake [Fri, 7 Aug 2015 16:11:05 +0000 (16:11 +0000)]
am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit '8d60fc3e3ecd4d7c2b18f25962f0ea42f3644ebd':
  Fix integer overflow when handling MPEG4 tx3g atom

9 years agoresolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp
Nick Kralevich [Fri, 7 Aug 2015 15:50:46 +0000 (08:50 -0700)]
resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

Bug: 20923261
Change-Id: I6fe12a7c5768f77454bd0391b07f4c3181607d14

9 years agoam 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow...
Joshua J. Drake [Tue, 4 Aug 2015 21:42:34 +0000 (21:42 +0000)]
am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit '338bbf53be077a99f532e813d4cf14a192c55f74':
  Fix integer overflow when handling MPEG4 tx3g atom

9 years agoam cd5cf679: am df1ecfe3: am 52d1defc: am 9481a101: am a81b3779: Prevent integer...
Joshua J. Drake [Tue, 4 Aug 2015 21:42:33 +0000 (21:42 +0000)]
am cd5cf679: am df1ecfe3: am 52d1defc: am 9481a101: am a81b3779: Prevent integer overflow when processing covr MPEG4 atoms

* commit 'cd5cf6797c26ca7d3ce2f9a379bdef099dae2aae':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handlin...
Joshua J. Drake [Tue, 4 Aug 2015 21:37:00 +0000 (21:37 +0000)]
am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit 'fd334e346bd0fc9b11756539d1635eabdb6b04cb':
  Fix integer overflow when handling MPEG4 tx3g atom

9 years agoam df1ecfe3: am 52d1defc: am 9481a101: am a81b3779: Prevent integer overflow when...
Joshua J. Drake [Tue, 4 Aug 2015 21:36:59 +0000 (21:36 +0000)]
am df1ecfe3: am 52d1defc: am 9481a101: am a81b3779: Prevent integer overflow when processing covr MPEG4 atoms

* commit 'df1ecfe3913b9c3bce17947d877498093a42a56f':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g...
Joshua J. Drake [Tue, 4 Aug 2015 21:31:40 +0000 (21:31 +0000)]
am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit '03d539a7a9c8ae7aef9cb8bda9042187327566a2':
  Fix integer overflow when handling MPEG4 tx3g atom

9 years agoam 52d1defc: am 9481a101: am a81b3779: Prevent integer overflow when processing covr...
Joshua J. Drake [Tue, 4 Aug 2015 21:31:38 +0000 (21:31 +0000)]
am 52d1defc: am 9481a101: am a81b3779: Prevent integer overflow when processing covr MPEG4 atoms

* commit '52d1defcfe51bd3b5f4e191fb70a0a0a406c33dc':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom
Joshua J. Drake [Tue, 4 Aug 2015 21:25:40 +0000 (21:25 +0000)]
am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit 'a5b9055d7ce1d82ee29ed2f45aa4f8a82ccc76f2':
  Fix integer overflow when handling MPEG4 tx3g atom

9 years agoam 9481a101: am a81b3779: Prevent integer overflow when processing covr MPEG4 atoms
Joshua J. Drake [Tue, 4 Aug 2015 21:25:38 +0000 (21:25 +0000)]
am 9481a101: am a81b3779: Prevent integer overflow when processing covr MPEG4 atoms

* commit '9481a101f8246263d969af66a7b39fad7346772e':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoam f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom
Joshua J. Drake [Tue, 4 Aug 2015 21:18:32 +0000 (21:18 +0000)]
am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit 'f1ce97ddc2f82d844a6fb8341585eb7b2e655f44':
  Fix integer overflow when handling MPEG4 tx3g atom

9 years agoam a81b3779: Prevent integer overflow when processing covr MPEG4 atoms
Joshua J. Drake [Tue, 4 Aug 2015 21:18:30 +0000 (21:18 +0000)]
am a81b3779: Prevent integer overflow when processing covr MPEG4 atoms

* commit 'a81b3779cc6f6046c8a9149bf544e9d726c9b2b2':
  Prevent integer overflow when processing covr MPEG4 atoms

9 years agoFix integer overflow when handling MPEG4 tx3g atom
Joshua J. Drake [Mon, 4 May 2015 23:29:08 +0000 (18:29 -0500)]
Fix integer overflow when handling MPEG4 tx3g atom

When the sum of the 'size' and 'chunk_size' variables is larger than 2^32,
an integer overflow occurs. Using the result value to allocate memory
leads to an undersized buffer allocation and later a potentially
exploitable heap corruption condition. Ensure that integer overflow does
not occur.

Bug: 20923261
(cherry picked from commit e5f0966c76bd0a7e81e4205c8d8b55e6b34c833e)

Change-Id: I3f240f75fd681becbf89cb7e7554388471c28059

9 years agoPrevent integer overflow when processing covr MPEG4 atoms
Joshua J. Drake [Mon, 4 May 2015 23:36:35 +0000 (18:36 -0500)]
Prevent integer overflow when processing covr MPEG4 atoms

If the 'chunk_data_size' value is SIZE_MAX, an integer overflow will occur
and cause an undersized buffer to be allocated. The following processing
then overfills the resulting memory and creates a potentially exploitable
condition. Ensure that integer overflow does not occur.

(cherrypicked from commit 05ddc499b9d50c90f552ed1333110f28a1406e7c)

Bug: 20923261
Change-Id: If09a02738759acdff8d95149bb9cb5f18a0a123e

9 years agoam b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am...
Wei Jia [Tue, 4 Aug 2015 17:51:22 +0000 (17:51 +0000)]
am b0924c63: am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit 'b0924c631cfccd10c1f95d6ae44c8cd852e14a9f':
  SampleTable: fix integer overflow checks.

9 years agoam 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am...
Wei Jia [Tue, 4 Aug 2015 17:29:31 +0000 (17:29 +0000)]
am 7af634e1: am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit '7af634e131361862d2e47fb344278e31ed05be4f':
  SampleTable: fix integer overflow checks.

9 years agoam 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleT...
Wei Jia [Tue, 4 Aug 2015 17:20:14 +0000 (17:20 +0000)]
am 8ec119d2: am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit '8ec119d2f033221e4cb0fd2b2948e780581b3d35':
  SampleTable: fix integer overflow checks.

9 years agoam d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix...
Wei Jia [Tue, 4 Aug 2015 17:09:44 +0000 (17:09 +0000)]
am d138024f: am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit 'd138024f94fe01934be700ce16aa84418fbe1827':
  SampleTable: fix integer overflow checks.

9 years agoam b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow...
Wei Jia [Tue, 4 Aug 2015 16:59:31 +0000 (16:59 +0000)]
am b32957db: am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit 'b32957dbf4527251ad3b2bbda4ccc5fff4df0718':
  SampleTable: fix integer overflow checks.

9 years agoam a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.
Wei Jia [Tue, 4 Aug 2015 16:54:23 +0000 (16:54 +0000)]
am a9d7c917: am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit 'a9d7c917d3a76d0bef9b8afe7ade206534be68a4':
  SampleTable: fix integer overflow checks.

9 years agoam a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.
Wei Jia [Tue, 4 Aug 2015 16:47:48 +0000 (16:47 +0000)]
am a99d3d83: am 738a753a: SampleTable: fix integer overflow checks.

* commit 'a99d3d8327d60c8f8ef3e34fc4b81ef382e9e6d2':
  SampleTable: fix integer overflow checks.

9 years agoam 738a753a: SampleTable: fix integer overflow checks.
Wei Jia [Tue, 4 Aug 2015 16:40:31 +0000 (16:40 +0000)]
am 738a753a: SampleTable: fix integer overflow checks.

* commit '738a753a3ca7bf8f9f608ca941575626265294e4':
  SampleTable: fix integer overflow checks.

9 years agoSampleTable: fix integer overflow checks.
Wei Jia [Thu, 4 Jun 2015 17:40:23 +0000 (10:40 -0700)]
SampleTable: fix integer overflow checks.

Bug: 20139950
Bug: 22935234
(cherry picked from commit a105482ae577852ffd08ce88ae5d1ba81db875ac)

Change-Id: I408d261de1a6dd5c4343bcf3a7dfd8a259e0e2f3

9 years agoam ac7cb990: am b417986c: am d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am...
Joshua J. Drake [Tue, 4 Aug 2015 04:45:44 +0000 (04:45 +0000)]
am ac7cb990: am b417986c: am d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit 'ac7cb990cc4c8a59a945ce36e5702e0adb213db4':
  Fix integer underflow in ESDS processing

9 years agoam 134dc311: am 80a6d9f3: am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am...
Joshua J. Drake [Tue, 4 Aug 2015 04:45:42 +0000 (04:45 +0000)]
am 134dc311: am 80a6d9f3: am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '134dc3110c401544e4d3a3a1deab1c131fb77720':
  Fix integer overflow during MP4 atom processing

9 years agoam 4837e90f: am 9c5578c1: am 36617c67: am 7374360f: am 4e44b2ee: am 4534ec1a: am...
Joshua J. Drake [Tue, 4 Aug 2015 04:45:41 +0000 (04:45 +0000)]
am 4837e90f: am 9c5578c1: am 36617c67: am 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '4837e90fd1d3fa127ef99652d314ad70f4776221':
  Fix several ineffective integer overflow checks

9 years agoam b417986c: am d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am...
Joshua J. Drake [Tue, 4 Aug 2015 03:35:37 +0000 (03:35 +0000)]
am b417986c: am d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit 'b417986c3a3a6bb9ca33657385a3433ff54090b2':
  Fix integer underflow in ESDS processing

9 years agoam 80a6d9f3: am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am...
Joshua J. Drake [Tue, 4 Aug 2015 03:35:36 +0000 (03:35 +0000)]
am 80a6d9f3: am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '80a6d9f37571c89905b8ae4074529a960a5f2194':
  Fix integer overflow during MP4 atom processing

9 years agoam 9c5578c1: am 36617c67: am 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am...
Joshua J. Drake [Tue, 4 Aug 2015 03:35:34 +0000 (03:35 +0000)]
am 9c5578c1: am 36617c67: am 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '9c5578c1a3bb00623d6ee99340ce0ce290e6c5a1':
  Fix several ineffective integer overflow checks

9 years agoam d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix...
Joshua J. Drake [Tue, 4 Aug 2015 03:25:53 +0000 (03:25 +0000)]
am d1c08d6b: am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit 'd1c08d6bff6d1936cf0e9cbfa5054128f5280ef3':
  Fix integer underflow in ESDS processing

9 years agoam e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix...
Joshua J. Drake [Tue, 4 Aug 2015 03:25:52 +0000 (03:25 +0000)]
am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit 'e10c2e621a0a49618c9d69a7dd09400c23464ced':
  Fix integer overflow during MP4 atom processing

9 years agoam 36617c67: am 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix...
Joshua J. Drake [Tue, 4 Aug 2015 03:25:51 +0000 (03:25 +0000)]
am 36617c67: am 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '36617c67a9c29d7f9798972b6514086b22b731f8':
  Fix several ineffective integer overflow checks

9 years agoam efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflo...
Joshua J. Drake [Tue, 4 Aug 2015 03:15:46 +0000 (03:15 +0000)]
am efa73c2e: am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit 'efa73c2e5f5a4eb7c420b5920e00de5a69f525af':
  Fix integer underflow in ESDS processing

9 years agoam 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow...
Joshua J. Drake [Tue, 4 Aug 2015 03:15:45 +0000 (03:15 +0000)]
am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '74ebcd65d1833879944a496739da6983b1d18235':
  Fix integer overflow during MP4 atom processing

9 years agoam 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffect...
Joshua J. Drake [Tue, 4 Aug 2015 03:15:44 +0000 (03:15 +0000)]
am 7374360f: am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '7374360f60999bfeabe0fb24e985073b7d8f47e8':
  Fix several ineffective integer overflow checks

9 years agoam 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS...
Joshua J. Drake [Tue, 4 Aug 2015 03:03:53 +0000 (03:03 +0000)]
am 2e24d091: am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit '2e24d0911ee585cbd447efe6150bafaaf8f9ef66':
  Fix integer underflow in ESDS processing

9 years agoam 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4...
Joshua J. Drake [Tue, 4 Aug 2015 03:03:52 +0000 (03:03 +0000)]
am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '272f4056162e119db61fb304b01f0152c07b8e02':
  Fix integer overflow during MP4 atom processing

9 years agoam 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer...
Joshua J. Drake [Tue, 4 Aug 2015 03:03:51 +0000 (03:03 +0000)]
am 4e44b2ee: am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '4e44b2ee286bd993210aa81ad20ebbf1d1a816c6':
  Fix several ineffective integer overflow checks

9 years agoam a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing
Joshua J. Drake [Tue, 4 Aug 2015 02:56:01 +0000 (02:56 +0000)]
am a59d5e66: am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit 'a59d5e6692d0b0dc0924144f596d09e7dd2b193c':
  Fix integer underflow in ESDS processing

9 years agoam 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing
Joshua J. Drake [Tue, 4 Aug 2015 02:55:59 +0000 (02:55 +0000)]
am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '52302d917b06b11625b9de686153d1e2520f42cd':
  Fix integer overflow during MP4 atom processing

9 years agoam 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks
Joshua J. Drake [Tue, 4 Aug 2015 02:55:56 +0000 (02:55 +0000)]
am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '4534ec1a552c125ef7eea0990a84fcefb58335b9':
  Fix several ineffective integer overflow checks

9 years agoam 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing
Joshua J. Drake [Tue, 4 Aug 2015 02:50:52 +0000 (02:50 +0000)]
am 8ef5da3d: am 4dd7cb69: Fix integer underflow in ESDS processing

* commit '8ef5da3ddddd1bb4356d9cc6df4d52ad8afc4459':
  Fix integer underflow in ESDS processing

9 years agoam f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing
Joshua J. Drake [Tue, 4 Aug 2015 02:50:51 +0000 (02:50 +0000)]
am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit 'f354c48e386d1405d67882c382e26e3e4598e797':
  Fix integer overflow during MP4 atom processing

9 years agoam 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks
Joshua J. Drake [Tue, 4 Aug 2015 02:50:45 +0000 (02:50 +0000)]
am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '4a5fbf74b493eb293918c41a5b5f60dd7b8ebb58':
  Fix several ineffective integer overflow checks

9 years agoam 4dd7cb69: Fix integer underflow in ESDS processing
Joshua J. Drake [Tue, 4 Aug 2015 02:41:32 +0000 (02:41 +0000)]
am 4dd7cb69: Fix integer underflow in ESDS processing

* commit '4dd7cb699f49b56f94a32080fdac7f0ec8237ff4':
  Fix integer underflow in ESDS processing

9 years agoam 5c4428f6: Fix integer overflow during MP4 atom processing
Joshua J. Drake [Tue, 4 Aug 2015 02:41:31 +0000 (02:41 +0000)]
am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '5c4428f6391478ae983e1fcf7c42c832aa1a5e69':
  Fix integer overflow during MP4 atom processing

9 years agoam 3cc11bfc: Fix several ineffective integer overflow checks
Joshua J. Drake [Tue, 4 Aug 2015 02:41:30 +0000 (02:41 +0000)]
am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '3cc11bfc00cbb3ed87a4464777a75606b4973b51':
  Fix several ineffective integer overflow checks

9 years agoFix integer underflow in ESDS processing
Joshua J. Drake [Thu, 9 Apr 2015 04:53:10 +0000 (23:53 -0500)]
Fix integer underflow in ESDS processing

Several arithmetic operations within parseESDescriptor could underflow, leading
to an out-of-bounds read operation. Ensure that subtractions from 'size' do not
cause it to wrap around.

Bug: 20139950
Change-Id: I0d1b136ce68fd7c6f606ce66714bf644cfb2961c
(cherry picked from commit 07c0f59d6c48874982d2b5c713487612e5af465a)

9 years agoFix integer overflow during MP4 atom processing
Joshua J. Drake [Thu, 9 Apr 2015 04:44:57 +0000 (23:44 -0500)]
Fix integer overflow during MP4 atom processing

A few sample table related FourCC values are handled by the
setSampleToChunkParams function. An integer overflow exists within this
function. Validate that mNumSampleToChunkOffets will not cause an integer
overflow.

Bug: 20139950
Change-Id: I1972cc185fce5e058afa143ad5eabcc269ad324d
(cherry picked from commit c24607c29c96f939aed9e33bfa702b1dd79da4b7)

9 years agoFix several ineffective integer overflow checks
Joshua J. Drake [Thu, 9 Apr 2015 04:23:55 +0000 (23:23 -0500)]
Fix several ineffective integer overflow checks

Commit edd4a76 (which addressed bugs 153287081534261515342751) added
several integer overflow checks. Unfortunately, those checks fail to take into
account integer promotion rules and are thus themselves subject to an integer
overflow. Cast the sizeof() operator to a uint64_t to force promotion while
multiplying.

Bug: 20139950
Change-Id: Ieb29a170edb805c722fc5658935f2390003e5260
(cherry picked from commit e2e812e58e8d2716b00d7d82db99b08d3afb4b32)

9 years agoam e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing
Eric Laurent [Mon, 10 Nov 2014 23:16:22 +0000 (23:16 +0000)]
am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing

* commit 'e360f0f6cad290f69e07fd3a20dcf11a1dbc4160':
  IAudioPolicyService: bound array size in queryDefaultPreProcessing

9 years agoIAudioPolicyService: bound array size in queryDefaultPreProcessing
Eric Laurent [Wed, 5 Nov 2014 20:15:36 +0000 (12:15 -0800)]
IAudioPolicyService: bound array size in queryDefaultPreProcessing

Bug: 18226810.
Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124
(cherry picked from commit 74adca9ad30b7f8a70d40c5237bade0d16c4ea58)

9 years agoam 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am...
Eric Laurent [Fri, 31 Oct 2014 00:11:15 +0000 (00:11 +0000)]
am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '96016c2d583ccca9fffd6974cb9473f7effd6cf5':
  audio policy: validate stream type received from binder calls.

9 years agoam 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am...
Eric Laurent [Thu, 30 Oct 2014 23:55:43 +0000 (23:55 +0000)]
am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '9944ff09ac4eb076cab994ef245b0103f60836ba':
  audio policy: validate stream type received from binder calls.

9 years agoam 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio...
Eric Laurent [Thu, 30 Oct 2014 23:48:47 +0000 (23:48 +0000)]
am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '70c3507d915baaa5a0ab163eeb0a445030f4f492':
  audio policy: validate stream type received from binder calls.

9 years agoam 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: valida...
Eric Laurent [Thu, 30 Oct 2014 23:41:08 +0000 (23:41 +0000)]
am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '450b10c97514411ef1d0d887d4e18851fd286f0b':
  audio policy: validate stream type received from binder calls.

9 years agoam d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream...
Eric Laurent [Thu, 30 Oct 2014 23:25:15 +0000 (23:25 +0000)]
am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit 'd0f9dc7156e531d5cd0615f6e682d2449e08e9a7':
  audio policy: validate stream type received from binder calls.

9 years agoam e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received...
Eric Laurent [Thu, 30 Oct 2014 23:01:01 +0000 (23:01 +0000)]
am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit 'e0a65f3008ac5874106b21d03e19296c8015da41':
  audio policy: validate stream type received from binder calls.

9 years agoam f5af3a72: am 6d80b687: audio policy: validate stream type received from binder...
Eric Laurent [Thu, 30 Oct 2014 22:52:48 +0000 (22:52 +0000)]
am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit 'f5af3a72f308cd4dff7859e62922ee5a13bd4c15':
  audio policy: validate stream type received from binder calls.

9 years agoam 6d80b687: audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 22:44:00 +0000 (22:44 +0000)]
am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '6d80b687c3b8d9c8da7cdad7d9813aa51c1cf15e':
  audio policy: validate stream type received from binder calls.

9 years agoaudio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 21:46:18 +0000 (14:46 -0700)]
audio policy: validate stream type received from binder calls.

Bug: 18001784.
Bug: 18002005.
Change-Id: If08866a3c21bcbfd8cdbbf8336bcf1faad66f321

9 years agoam 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am...
Robert Shih [Wed, 10 Sep 2014 20:48:04 +0000 (20:48 +0000)]
am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '0d83cf22991c48f4bb5f2afe3d16ae076861f394':
  SampleTable: check integer overflow during table alloc

9 years agoam 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am...
Robert Shih [Wed, 10 Sep 2014 20:26:40 +0000 (20:26 +0000)]
am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '97d917bc1ccc958d8f1051de6a888de9a25dc6bd':
  SampleTable: check integer overflow during table alloc

9 years agoam ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleT...
Robert Shih [Wed, 10 Sep 2014 20:19:54 +0000 (20:19 +0000)]
am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit 'ab0b3212e0c15132f2dab2beeb39c47d31bb1dab':
  SampleTable: check integer overflow during table alloc

9 years agoam 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check...
Robert Shih [Wed, 10 Sep 2014 20:09:14 +0000 (20:09 +0000)]
am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '9b51a37fa8ad9d28be791213ceba4fcbec52b14d':
  SampleTable: check integer overflow during table alloc

9 years agoam cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overfl...
Robert Shih [Wed, 10 Sep 2014 19:58:37 +0000 (19:58 +0000)]
am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit 'cb5dc219b78e6eeacb7ee2f5c93e6763db677122':
  SampleTable: check integer overflow during table alloc

9 years agoam 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during...
Robert Shih [Wed, 10 Sep 2014 19:47:42 +0000 (19:47 +0000)]
am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '74abb1ae32fbd3fa4112cc8b8d53882777feb191':
  SampleTable: check integer overflow during table alloc

9 years agoam 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:41:45 +0000 (19:41 +0000)]
am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc

* commit '482b18bbfd6c9214157bfab47feae86df48a7178':
  SampleTable: check integer overflow during table alloc

9 years agoam f106b199: SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:31:46 +0000 (19:31 +0000)]
am f106b199: SampleTable: check integer overflow during table alloc

* commit 'f106b1993143df44282777253244ce67974c9d4a':
  SampleTable: check integer overflow during table alloc

9 years agoSampleTable: check integer overflow during table alloc
Robert Shih [Mon, 28 Jul 2014 16:54:57 +0000 (09:54 -0700)]
SampleTable: check integer overflow during table alloc

Bug: 15328708
Bug: 15342615
Bug: 15342751
Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053
(cherry picked from commit edd4a76eb4747bd19ed122df46fa46b452c12a0d)

10 years agoam 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix...
Marco Nelissen [Thu, 20 Mar 2014 20:29:33 +0000 (13:29 -0700)]
am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '01eed3c0fb951e349d68f4bce818bef22e7925b1':
  Fix build

10 years agoam 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:18:07 +0000 (13:18 -0700)]
am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '7a107b857e658ba11c0c1fd2325ac91a2c0569a2':
  Fix build

10 years agoam 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:13:35 +0000 (13:13 -0700)]
am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '854aa061b1e2d7eaaf8ffa2ead323c1478393c57':
  Fix build

10 years agoam 42ba5806: am 72499628: am 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:08:17 +0000 (13:08 -0700)]
am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '42ba5806c03753a39f85016265173819ac465745':
  Fix build

10 years agoam 72499628: am 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:04:11 +0000 (13:04 -0700)]
am 72499628: am 25bab830: Fix build

* commit '72499628a24ccea0befe726de6e2b32176ddf208':
  Fix build

10 years agoam 25bab830: Fix build
Marco Nelissen [Thu, 20 Mar 2014 20:00:07 +0000 (13:00 -0700)]
am 25bab830: Fix build

* commit '25bab830af062dcaef6f75220066b221fd30957e':
  Fix build

10 years agoFix build
Marco Nelissen [Thu, 20 Mar 2014 19:32:48 +0000 (12:32 -0700)]
Fix build

As of jb-mr1, need to explicitly include library dependencies. The original
change in jb, which the automerger dutyfully merged, did not need this.

Change-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7

10 years agoam 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am...
Marco Nelissen [Thu, 20 Mar 2014 18:08:43 +0000 (11:08 -0700)]
am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '0e0891f8b49f31e6a28b563f86aae537e66bb6e0':
  Verify certificates

10 years agoam 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am...
Marco Nelissen [Thu, 20 Mar 2014 17:49:15 +0000 (10:49 -0700)]
am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '6cdc90b5e41374dd665df3ae7283ef0c1f532678':
  Verify certificates

10 years agoam ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify...
Marco Nelissen [Thu, 20 Mar 2014 17:31:32 +0000 (10:31 -0700)]
am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'ebc9b47330ab8565f7bdd9b3973a8f75e3206e77':
  Verify certificates

10 years agoam fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:27:04 +0000 (10:27 -0700)]
am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'fb49b8bad468db591f55a7064181372f02ad94a2':
  Verify certificates

10 years agoam dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:21:14 +0000 (10:21 -0700)]
am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'dfd90c8052a913ed2bbbea1873ee51838d40bfe1':
  Verify certificates

10 years agoam d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:16:53 +0000 (10:16 -0700)]
am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates

* commit 'd434944b00cf83a38019047e0d7db155a15d77f4':
  Verify certificates

10 years agoam 3bc4f7ea: am 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:11:20 +0000 (10:11 -0700)]
am 3bc4f7ea: am 0c271b75: Verify certificates

* commit '3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed':
  Verify certificates

10 years agoam 0c271b75: Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:04:18 +0000 (10:04 -0700)]
am 0c271b75: Verify certificates

* commit '0c271b750f7314e187f8479f478ad9382d9a9045':
  Verify certificates

10 years agoVerify certificates
Marco Nelissen [Thu, 13 Mar 2014 21:18:25 +0000 (14:18 -0700)]
Verify certificates

b/13418320

Cherrypicked from 8a57d24c733b08da846b54d1adf029e606b5a5f3
https://googleplex-android-review.git.corp.google.com/#/c/433309/

Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b

10 years agoam 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb...
Adam Hampson [Wed, 13 Nov 2013 17:21:33 +0000 (09:21 -0800)]
am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev

* commit '00cb884fc870aba4052c8d187a45e4aec50a6b43':
  StageFright: Removes hacks for Nvidia MPEG2 decoder

10 years agoMerge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
Adam Hampson [Wed, 13 Nov 2013 17:14:31 +0000 (17:14 +0000)]
Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev

10 years agoam 6e3ee310: am 31d49615: am 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am...
Jeff Tinker [Mon, 19 Aug 2013 21:45:56 +0000 (14:45 -0700)]
am 6e3ee310: am 31d49615: am 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code

* commit '6e3ee310d90e30c928c9e29a4a07de4bcbf2855e':
  Remove obsolete drm manager code

10 years agoam 31d49615: am 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am...
Jeff Tinker [Mon, 19 Aug 2013 21:39:15 +0000 (14:39 -0700)]
am 31d49615: am 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code

* commit '31d49615007372621ac3fba55e9e3aab48c873f9':
  Remove obsolete drm manager code

10 years agoam 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove...
Jeff Tinker [Mon, 19 Aug 2013 21:36:05 +0000 (14:36 -0700)]
am 27b876d4: am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code

* commit '27b876d4cf78b262854b9f2aec26467f9323d3ad':
  Remove obsolete drm manager code

10 years agoam 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete...
Jeff Tinker [Mon, 19 Aug 2013 21:32:42 +0000 (14:32 -0700)]
am 9bc40a2c: am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code

* commit '9bc40a2cfdd307074ef5c23ad444fc8a782bab84':
  Remove obsolete drm manager code

10 years agoam 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:31:11 +0000 (14:31 -0700)]
am 98603acb: am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code

* commit '98603acbce87c3a451c8e4c26625048363c3f7f7':
  Remove obsolete drm manager code

10 years agoam 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:27:45 +0000 (14:27 -0700)]
am 36337f8f: am 7d72965f: am 60476336: Remove obsolete drm manager code

* commit '36337f8f1c4d7384cb1528205582148c85c69f4d':
  Remove obsolete drm manager code

10 years agoam 7d72965f: am 60476336: Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:24:50 +0000 (14:24 -0700)]
am 7d72965f: am 60476336: Remove obsolete drm manager code

* commit '7d72965ff6a4bf9f91213fbdafcd12cfad8334e5':
  Remove obsolete drm manager code

10 years agoam 60476336: Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:21:48 +0000 (14:21 -0700)]
am 60476336: Remove obsolete drm manager code

* commit '6047633622328711cc6b23667c8d6381bae179bf':
  Remove obsolete drm manager code