Commit Graph

15003 Commits

Author SHA1 Message Date
Narayan Kamath 3a53e2ce04 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999
am: b8f35dd70b

Change-Id: I9761ac7ba5f26a1e581fa1446e6e4b36753cf424
2016-09-21 17:51:26 +00:00
Narayan Kamath b8f35dd70b resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97 am: de03f5ac26
am: 7d106d5999

Change-Id: I5657567402cdce858ab88c253ba2badaa062ceca
2016-09-21 17:48:56 +00:00
Narayan Kamath 7d106d5999 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours am: c681771b97
am: de03f5ac26

Change-Id: I88f747f334701d9e6daf4c18aa07051948fc0322
2016-09-21 17:46:24 +00:00
Narayan Kamath de03f5ac26 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c -s ours
am: c681771b97

Change-Id: I0fb6263aa98124acb03e79b9c102c7ee6d3e94ba
2016-09-21 17:43:54 +00:00
Narayan Kamath c681771b97 resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582
am: af43cd033c  -s ours

Change-Id: Ifd07ba06cecf61ba53af64bae08f0dac679c9e06
2016-09-21 17:41:24 +00:00
Narayan Kamath af43cd033c resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7
am: b5f75c4582

Change-Id: Iacea86ad3c142d6f14b5fbdfb5b615f4705b1bd1
2016-09-21 17:35:52 +00:00
Narayan Kamath b5f75c4582 resolve merge conflicts of a47780b to lmp-dev
am: 61f27551c7

Change-Id: I418fb945e685e2983187c2ba43ad66ec99b468ec
2016-09-21 17:32:51 +00:00
Narayan Kamath 61f27551c7 resolve merge conflicts of a47780b to lmp-dev
Test: test_zipfile with known bad files.

Change-Id: I25dde73c9b94d253c8017e441e89cb7339907c7f
2016-09-21 09:57:39 +01:00
Narayan Kamath a47780b998 libzipfile: add additional validity checks. am: a1ec23634a
am: c307830f5d

Change-Id: I5d856cec4528541ff5416456cbe1338c78a09699
2016-09-21 08:26:10 +00:00
Narayan Kamath c307830f5d libzipfile: add additional validity checks.
am: a1ec23634a

Change-Id: I290e611776bd58b47266a2cb9371a832bdc0744e
2016-09-21 08:23:39 +00:00
Narayan Kamath a1ec23634a libzipfile: add additional validity checks.
- Make sure the start and end of the data for a given entry are
  within the allocated buffer.
- Make sure all central directory entries start and end within the
  central directory buffer.
- Reject zip file entries that have no filenames.

bug: 30916186
test: test_zipfile with known bad zip files.
Change-Id: Ibf3f6469e60c85ec1608f5ce613d40867d2d09b7
2016-09-13 16:08:38 +01:00
Mark Salyzyn 1b1b6a4889 liblog: add __android_log_close() am: b1b5d507cb am: f72c9bc42d
am: 49d5582f29

Change-Id: I11566801e6b467394b41dad598b697ceb43c9acf
2016-09-08 08:44:07 +00:00
Mark Salyzyn 49d5582f29 liblog: add __android_log_close() am: b1b5d507cb
am: f72c9bc42d

Change-Id: I144b6ef420fadb6155f5a1b367c58d26ca1dfaac
2016-09-08 08:40:25 +00:00
Mark Salyzyn f72c9bc42d liblog: add __android_log_close()
am: b1b5d507cb

Change-Id: I5d6a6e97960e88e6f668b6376ec296d7452ec1dc
2016-09-08 08:30:54 +00:00
Mark Salyzyn b1b5d507cb liblog: add __android_log_close()
Bug: 30963384

(cherry picked from commit df7a4c6bae)

Change-Id: Ide70df3c04e29301649a1ca234b1b0af687bcbfb
2016-09-07 20:17:39 +01:00
Narayan Kamath e5a1c7d8e4 Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f am: ffb34de445 am: baa3f2bdb2 am: 8013db9c75
am: a55e9f01fb

Change-Id: If64261d4be388b1879d5aea5d91dc77a7ec7a693
2016-09-07 19:16:24 +00:00
Mark Salyzyn 68afb4588f liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 am: 94ebdd6b39 am: 5f04ac60d6 am: 4d12c20a5e
am: e09c5d2ce4

Change-Id: Id19b06af22568f6fa70e9d1b381a4d8ce5b595d0
2016-09-07 19:16:23 +00:00
Narayan Kamath a55e9f01fb Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f am: ffb34de445 am: baa3f2bdb2
am: 8013db9c75

Change-Id: If9798691ad5a4db7928b50c6c2ce39745c113f74
2016-09-07 19:13:53 +00:00
Mark Salyzyn e09c5d2ce4 liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 am: 94ebdd6b39 am: 5f04ac60d6
am: 4d12c20a5e

Change-Id: Ie41afcef1401543ed3f05dce2834a31487bdc892
2016-09-07 19:13:53 +00:00
Narayan Kamath 8013db9c75 Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f am: ffb34de445
am: baa3f2bdb2

Change-Id: I1aba19963e78ce071e588687451f51fd860f664e
2016-09-07 19:11:23 +00:00
Mark Salyzyn 4d12c20a5e liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969 am: 94ebdd6b39
am: 5f04ac60d6

Change-Id: Ib449f7dd39aff26e47feab9796fac140152bae75
2016-09-07 19:11:22 +00:00
Narayan Kamath baa3f2bdb2 Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3 am: 0f6c4a0e8f
am: ffb34de445

Change-Id: I891a8ad2eebed4d7279ad582fef40bf1a72ff9b0
2016-09-07 19:08:53 +00:00
Mark Salyzyn 5f04ac60d6 liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef am: 7b16dcf969
am: 94ebdd6b39

Change-Id: I233e56242e7ef5c07e288c0e2baa11dfa0edf55a
2016-09-07 19:08:52 +00:00
Mark Salyzyn f3af4388fb liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a am: edbf5d59f0 am: 1b9ae6eae6 am: cfea0949a4 am: 87f09ae506
am: c1197f5b67

Change-Id: I9ec591fe17b1b8434728751654bd4f05e1556698
2016-09-07 19:06:43 +00:00
Narayan Kamath ffb34de445 Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007 am: 2f16f2b9b3
am: 0f6c4a0e8f

Change-Id: I1655bfde9e7a640f7087c891f0f5ad1b618fc9d9
2016-09-07 19:05:19 +00:00
Mark Salyzyn 94ebdd6b39 liblog: add __android_log_close() am: 2d14969155 am: 3b2fa3eaef
am: 7b16dcf969

Change-Id: Id17cdb4600a081c5fc0442cb244d65021dd0dbb6
2016-09-07 19:05:18 +00:00
Mark Salyzyn c1197f5b67 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a am: edbf5d59f0 am: 1b9ae6eae6 am: cfea0949a4
am: 87f09ae506

Change-Id: Ic666f14ecad87c3daf33e0238e0279b9a5514789
2016-09-07 19:04:04 +00:00
Mark Salyzyn 87f09ae506 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a am: edbf5d59f0 am: 1b9ae6eae6
am: cfea0949a4

Change-Id: If739c42c39dc18bbf99240874f2c557b98b441f3
2016-09-07 19:01:44 +00:00
Narayan Kamath 0f6c4a0e8f Merge "liblog: add __android_log_close()" into lmp-dev am: 0414412007
am: 2f16f2b9b3

Change-Id: Ie14a25a2b3562e98900f0529ea93c62d81706a03
2016-09-07 19:00:38 +00:00
Mark Salyzyn 7b16dcf969 liblog: add __android_log_close() am: 2d14969155
am: 3b2fa3eaef

Change-Id: If6373f3316ccdf6134995e19a2f0ff87dcfa0dfe
2016-09-07 19:00:38 +00:00
Mark Salyzyn cfea0949a4 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a am: edbf5d59f0
am: 1b9ae6eae6

Change-Id: I60b624ecff1bd1ec66f70f8b69743dbe369721ae
2016-09-07 18:58:16 +00:00
Mark Salyzyn 1b9ae6eae6 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d am: 1b6b34717a
am: edbf5d59f0

Change-Id: I988b1b0f43e1e72de4de331d40fafd03e42b52e9
2016-09-07 18:56:19 +00:00
Narayan Kamath 2f16f2b9b3 Merge "liblog: add __android_log_close()" into lmp-dev
am: 0414412007

Change-Id: I68ce225df8ce136041415af10d7d4ca1611e96bd
2016-09-07 18:55:28 +00:00
Mark Salyzyn 3b2fa3eaef liblog: add __android_log_close()
am: 2d14969155

Change-Id: Ieb4a9620abfe505c7f036deab79a7abcc6ea64b2
2016-09-07 18:55:28 +00:00
Mark Salyzyn edbf5d59f0 liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours am: ef661e0a6d
am: 1b6b34717a

Change-Id: I783a945c770eb32a9c1730d6517b9148f8f435ad
2016-09-07 18:53:15 +00:00
Mark Salyzyn 1b6b34717a liblog: add __android_log_close() am: c68706fe49 am: edc5507f76 am: 85b0dd64f1 -s ours
am: ef661e0a6d

Change-Id: If1f4ca703a0c182386e2a309fc7553900c683adf
2016-09-07 18:50:51 +00:00
Narayan Kamath 0414412007 Merge "liblog: add __android_log_close()" into lmp-dev 2016-09-07 18:48:15 +00:00
Mark Salyzyn ef661e0a6d liblog: add __android_log_close() am: c68706fe49 am: edc5507f76
am: 85b0dd64f1  -s ours

Change-Id: If80f5b856cbcfc0334696e9d734e8c9ad90eca36
2016-09-07 18:48:03 +00:00
Mark Salyzyn 85b0dd64f1 liblog: add __android_log_close() am: c68706fe49
am: edc5507f76

Change-Id: Ia2acfa02bd8f7e35d83791ea8242139a7ac34435
2016-09-07 18:43:14 +00:00
Mark Salyzyn edc5507f76 liblog: add __android_log_close()
am: c68706fe49

Change-Id: I0f63dcafaa4b6bf40dddb3674c3768b0cb158fe4
2016-09-07 18:40:15 +00:00
Mark Salyzyn 2d14969155 liblog: add __android_log_close()
Bug: 30963384

(cherry picked from commit df7a4c6bae)

Change-Id: I2255486e84dd55af0f4e7fbbfb616c2deb1765d0
2016-09-05 15:50:58 +01:00
Mark Salyzyn c68706fe49 liblog: add __android_log_close()
Bug: 30963384

(cherry picked from commit df7a4c6bae)

Change-Id: Iff0634a66c4b690331f5da66f7a6c2364b64480e
2016-09-05 15:44:22 +01:00
Connor O'Brien 6b155c1cc4 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 am: 2f78b2c3d6 am: 2b5e6d8ffc
am: 2427a462c0

Change-Id: I01f2884b4af05dc76ebd7db9621cd2c64030d28d
2016-08-19 22:46:51 +00:00
Connor O'Brien 2427a462c0 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 am: 2f78b2c3d6
am: 2b5e6d8ffc

Change-Id: If569f85d732872e25775cafe6aea6e9cc3d50bf3
2016-08-19 22:43:00 +00:00
Connor O'Brien 2b5e6d8ffc Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1
am: 2f78b2c3d6

Change-Id: I9e1bd65c9ae556b8115bef24449b502417718807
2016-08-19 22:40:33 +00:00
Connor O'Brien 2f78b2c3d6 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb
am: 9745b11db1

Change-Id: I61f685976803f51db9ba85729554fc14efaa4b2c
2016-08-19 22:36:29 +00:00
Connor O'Brien 9745b11db1 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4
am: e04054d9bb

Change-Id: Ia5f46e5b9622946ca0e44fbe7399729807d2d08a
2016-08-19 22:34:46 +00:00
Connor O'Brien e04054d9bb Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9
am: 2fadbb93a4

Change-Id: I19405fe2bbf0034db3fc0298d1616df5611e2a92
2016-08-19 22:18:34 +00:00
Connor O'Brien 2fadbb93a4 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a
am: b906ad88b9

Change-Id: Ida2b33bd1db284dfa8ad3f130219481a92785e97
2016-08-19 22:14:57 +00:00
Connor O'Brien b906ad88b9 Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c
am: 109024f74a

Change-Id: Ia6e8dca36bc28d442a6e374ecf033b79176f4b93
2016-08-19 22:11:27 +00:00