Commit Graph

28578 Commits

Author SHA1 Message Date
Keun-young Park ec647d5639 Merge "Revert "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"" am: cbb91a538f am: b2ce87de12
am: 12e13e172d

Change-Id: Id16b21392aca9a2feb2a90a6808a9eb465e365c8
2017-02-15 21:38:20 +00:00
Keun-young Park 12e13e172d Merge "Revert "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"" am: cbb91a538f
am: b2ce87de12

Change-Id: I754d121a0d94a281cbdcb8642d0bb9722f0be5b0
2017-02-15 21:33:54 +00:00
Keun-young Park b2ce87de12 Merge "Revert "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled""
am: cbb91a538f

Change-Id: I2807440a4df091743134387661c5fec9e998ba8e
2017-02-15 21:29:09 +00:00
Treehugger Robot cbb91a538f Merge "Revert "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"" 2017-02-15 21:00:58 +00:00
Josh Gao 60515bf9f1 debuggerd_handler: don't use snprintf in handler.
snprintf isn't safe to call in the linker after initialization, because
it uses MB_CUR_MAX which is implemented via pthread_getspecific, which
uses TLS slots shared with libc. If the TLS slots are assigned in a
different order between libc.so and the linker, MB_CUR_MAX will
evaluate to an incorrect value, and lead to snprintf doing bad things.

Switch to __libc_format_buffer.

Bug: http://b/35367169
Test: debuggerd -b `pidof zygote`
Change-Id: I9d315cf63e5f3fd2f4545d6e3f707cdbe94ec606
2017-02-15 12:24:09 -08:00
Keun-young Park 2517da9f97 Revert "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"
This reverts commit 22e8199175.

- revert for now. will collect more data to check safety.

bug: 32246772
Test: reboots

Change-Id: Ibbb39005c64b26e9990c271b0b949feafae17773
2017-02-15 11:02:59 -08:00
Josh Gao 45499618b3 Merge "debuggerd_handler: set PR_SET_DUMPABLE before running crash_dump." am: af776fd518 am: 877becaf7e
am: 274eb16422

Change-Id: Ib1cc8ef92279adcf87f5c0546bfe77c89aba6ca5
2017-02-15 07:33:41 +00:00
Josh Gao 274eb16422 Merge "debuggerd_handler: set PR_SET_DUMPABLE before running crash_dump." am: af776fd518
am: 877becaf7e

Change-Id: Icb5c2ade77a25dea268cc311fc7ddb45c10aa76e
2017-02-15 07:30:41 +00:00
Josh Gao 877becaf7e Merge "debuggerd_handler: set PR_SET_DUMPABLE before running crash_dump."
am: af776fd518

Change-Id: I65a4cf9167f1d2804bd5193f492126e74188b43c
2017-02-15 07:27:41 +00:00
Treehugger Robot af776fd518 Merge "debuggerd_handler: set PR_SET_DUMPABLE before running crash_dump." 2017-02-15 07:24:11 +00:00
Josh Gao 2a80862300 Merge changes I32567010,I400d5991 am: 1d26b40ed5 am: 1e4efdaeac
am: 2e0997bccd

Change-Id: Ia8f428bc7c79f795976ffb02316b2ee096c43f01
2017-02-15 05:30:03 +00:00
Josh Gao 2e0997bccd Merge changes I32567010,I400d5991 am: 1d26b40ed5
am: 1e4efdaeac

Change-Id: I8f602d5602178cdf2a272d27d9c38be60c128747
2017-02-15 05:27:03 +00:00
Josh Gao 1e4efdaeac Merge changes I32567010,I400d5991
am: 1d26b40ed5

Change-Id: Ic4046bdbaf0b11936f2ea1e66bccebf72f9d7bdf
2017-02-15 05:24:05 +00:00
Josh Gao 2f11a25a48 debuggerd_handler: set PR_SET_DUMPABLE before running crash_dump.
Set and restore PR_SET_DUMPABLE when performing a dump, so that
processes that have it implicitly cleared (e.g. services that acquire
filesystem capabilities) still get crash dumps.

Bug: http://b/35174939
Test: debuggerd -b `pidof surfaceflinger`
Change-Id: Ife933c10086e546726dec12a7efa3f9cedfeea60
2017-02-14 21:19:38 -08:00
Josh Gao 1d26b40ed5 Merge changes I32567010,I400d5991
* changes:
  debuggerd_handler: raise capabilities before running crash_dump.
  crasher: add a case that uses PR_SET_NO_NEW_PRIVS.
2017-02-15 05:19:01 +00:00
Elliott Hughes aa126445cb Merge "Only sanitize Android." am: a22ce825e6 am: 98536b07fc
am: 9297e0e314

Change-Id: Ibade4c5e57c3c9922d09a13a09514a56c996ecfd
2017-02-15 01:43:18 +00:00
Elliott Hughes 9297e0e314 Merge "Only sanitize Android." am: a22ce825e6
am: 98536b07fc

Change-Id: I56c9f432277dc1122d6fb756190c0e6337db0877
2017-02-15 01:41:17 +00:00
Elliott Hughes 98536b07fc Merge "Only sanitize Android."
am: a22ce825e6

Change-Id: I54991f4989b054cbca8d3326581a6a60392ecfc4
2017-02-15 01:38:18 +00:00
Treehugger Robot a22ce825e6 Merge "Only sanitize Android." 2017-02-15 01:32:11 +00:00
Greg Hackmann 095da6fb73 libadf: support ADF_{POST,SIMPLE_POST}_CONFIG_V2 ioctls
adf_{device,interface_simple}_post_v2 let the client choose what kind of
fence is returned from the kernel:

* ADF_COMPLETE_FENCE_NONE: no fence is returned
* ADF_COMPLETE_FENCE_PRESENT: the returned fence fires when the
  specified configuration appears on the screen
* ADF_COMPLETE_FENCE_RELEASE: the returned fence fires when the
  specified configuration is removed from the screen

The "V2" calls with fence type ADF_COMPLETE_FENCE_RELEASE are functionally
equivalent to "V1" calls.

Test: included gtest (on Nexus 9)
Change-Id: I36190d1b6cea0fbaed2af3ad64fa4729200c5520
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2017-02-14 16:06:05 -08:00
Elliott Hughes ec46f4ed28 Only sanitize Android.
Bug: N/A
Test: didn't
Change-Id: I9b9bc04112501eaa9f9ccf23152fc5d118b03000
2017-02-14 15:46:33 -08:00
Mark Salyzyn 990b2d8a47 Merge "Revert "Check against LOG_ID_MAX instead of LOG_ID_KERNEL"" am: 2bc8e32242 am: bbb4fa78a6
am: 70c2889d3a

Change-Id: I6901b1bef8e65833aa77e2d0308ee62b7388265c
2017-02-14 23:34:09 +00:00
Mark Salyzyn 70c2889d3a Merge "Revert "Check against LOG_ID_MAX instead of LOG_ID_KERNEL"" am: 2bc8e32242
am: bbb4fa78a6

Change-Id: I7946e677a29570ddbc89c4c60449a225d94acf2f
2017-02-14 23:19:36 +00:00
Mark Salyzyn bbb4fa78a6 Merge "Revert "Check against LOG_ID_MAX instead of LOG_ID_KERNEL""
am: 2bc8e32242

Change-Id: Ide666aec2b5822828b1c86b9430c6d6fbee303ff
2017-02-14 23:16:36 +00:00
Treehugger Robot 2bc8e32242 Merge "Revert "Check against LOG_ID_MAX instead of LOG_ID_KERNEL"" 2017-02-14 23:08:16 +00:00
Josh Gao d2069632bd debuggerd_handler: raise capabilities before running crash_dump.
Raise CapInh and CapAmb after forking to exec crash_dump, so that it
can ptrace us.

Bug: http://b/35174939
Test: debuggerd -b `pidof surfaceflinger`
Change-Id: I32567010a3603cfa494aae9dc0e3ce73fb86b590
2017-02-14 14:40:47 -08:00
Josh Gao 91ad653c82 crasher: add a case that uses PR_SET_NO_NEW_PRIVS.
Bug: http://b/34684590
Test: crasher no_new_privs
Change-Id: I400d599116e3f3c27f5ea46d260e288cf900e156
2017-02-14 14:40:47 -08:00
Jerry Zhang b9c785a7d0 Merge changes from topic 'adb_perf' am: 42aa9a1415 am: 14e71a4af2
am: 3b36116ac7

Change-Id: I25e052d39b54b575efec8f9db198410ca3f17968
2017-02-14 21:56:45 +00:00
Jerry Zhang 3b36116ac7 Merge changes from topic 'adb_perf' am: 42aa9a1415
am: 14e71a4af2

Change-Id: I7d5accf6fbd922b82c711d15684c2b29cbeb7002
2017-02-14 21:54:00 +00:00
Jerry Zhang 14e71a4af2 Merge changes from topic 'adb_perf'
am: 42aa9a1415

Change-Id: I56b73a99b05634164379c700be9bdbd0a98c39c3
2017-02-14 21:51:34 +00:00
Jerry Zhang 42aa9a1415 Merge changes from topic 'adb_perf'
* changes:
  adb: Add bMaxBurst to superspeed descriptors
  adb: Set max socket sizes to larger values.
  adb: Pre allocate kernel memory
2017-02-14 21:46:27 +00:00
Mark Salyzyn f8fc6f1870 Revert "Check against LOG_ID_MAX instead of LOG_ID_KERNEL"
causes a regression, logcat -b kernel does not work.

Check should have landed in logd_writer.c

This reverts commit 2c2337a293.

Change-Id: I1004b44ecc87f5d83d1c4463dd8b1ac16499706d
2017-02-14 21:00:57 +00:00
Sandeep Patil 7f9c89ffcb Merge changes from topic 'pre-early-mount' am: 1549257ff5 am: c027aac7c8
am: 9e140bb206

Change-Id: Idda7bee037b87bdb0aa8a26d2cdb9ee7b90b0cbd
2017-02-14 20:41:56 +00:00
Sandeep Patil 9e140bb206 Merge changes from topic 'pre-early-mount' am: 1549257ff5
am: c027aac7c8

Change-Id: I58db246d8dd59d6863b43f9e4fb442e9e363de94
2017-02-14 20:39:27 +00:00
Sandeep Patil c027aac7c8 Merge changes from topic 'pre-early-mount'
am: 1549257ff5

Change-Id: I17bf2a322c0230f7cb368edd337e945742a10585
2017-02-14 20:37:01 +00:00
Treehugger Robot 1549257ff5 Merge changes from topic 'pre-early-mount'
* changes:
  init: fstab: add support to read fstab entries from device tree
  init: early_mount: add support to mount non-verity partitions early
  init: remove the existing early_mount code
  init: refactor: add support for doing early coldboot
  ueventd: make selinux labeling optional for device creation
2017-02-14 20:34:35 +00:00
James Hawkins 0e690dbed2 Merge "Revert "bootstat: Refactor init/utils/boot_clock into base/chrono_utils."" am: 91cf0bd5c0 am: a967cf817a
am: be6efcb5bb

Change-Id: I4dea64f7fc64510752332c52fd63d4916ac23414
2017-02-14 19:35:46 +00:00
James Hawkins be6efcb5bb Merge "Revert "bootstat: Refactor init/utils/boot_clock into base/chrono_utils."" am: 91cf0bd5c0
am: a967cf817a

Change-Id: I19958a0277180af5a3adbbf4c6937957ba17a936
2017-02-14 19:33:15 +00:00
James Hawkins a967cf817a Merge "Revert "bootstat: Refactor init/utils/boot_clock into base/chrono_utils.""
am: 91cf0bd5c0

Change-Id: Id003d25146804cc1def16c7d95e76a2c36cd8fad
2017-02-14 19:31:19 +00:00
James Hawkins 91cf0bd5c0 Merge "Revert "bootstat: Refactor init/utils/boot_clock into base/chrono_utils."" 2017-02-14 19:24:36 +00:00
James Hawkins c8ac067773 Revert "bootstat: Refactor init/utils/boot_clock into base/chrono_utils."
This reverts commit 7c92e48450.

Mac sdk still broken (despite testing locally).

Change-Id: I7d9206e15997cd0efe081bd3fa17d53d2b20ec32
2017-02-14 19:20:20 +00:00
Elliott Hughes ae9bde6c59 Merge "Fix ubsan failure in android::base::Split." am: aa9548dbb4 am: 09980cd1a8
am: 11f74d4e59

Change-Id: Ifd91bbf8d720f0b3fd4d7690c97a6d62bd9b685e
2017-02-14 19:09:03 +00:00
James Hawkins 9a7ff0e111 Merge "bootstat: Refactor init/utils/boot_clock into base/chrono_utils." am: e968b73e19 am: 07af328555
am: fe65699408

Change-Id: I7e8e928696e275bfcd899697a54bc33134f7c321
2017-02-14 19:08:49 +00:00
Elliott Hughes 11f74d4e59 Merge "Fix ubsan failure in android::base::Split." am: aa9548dbb4
am: 09980cd1a8

Change-Id: I49116f209d65365cc1caf3a50c09c7cc4178ecff
2017-02-14 19:07:01 +00:00
James Hawkins fe65699408 Merge "bootstat: Refactor init/utils/boot_clock into base/chrono_utils." am: e968b73e19
am: 07af328555

Change-Id: I3ca7fe3b3f9e3bec03377da5d01df2ae51e855f8
2017-02-14 19:06:49 +00:00
Elliott Hughes 09980cd1a8 Merge "Fix ubsan failure in android::base::Split."
am: aa9548dbb4

Change-Id: Iaa8593f981db12b65a6eb13fddf5e894f58ca7a7
2017-02-14 19:04:38 +00:00
James Hawkins 07af328555 Merge "bootstat: Refactor init/utils/boot_clock into base/chrono_utils."
am: e968b73e19

Change-Id: Ie060ef465e79724bc9920ad14f6e59a5c4f719cd
2017-02-14 19:04:24 +00:00
Treehugger Robot aa9548dbb4 Merge "Fix ubsan failure in android::base::Split." 2017-02-14 18:43:17 +00:00
Treehugger Robot e968b73e19 Merge "bootstat: Refactor init/utils/boot_clock into base/chrono_utils." 2017-02-14 18:35:54 +00:00
Narayan Kamath dd950ba9d4 Merge "Reapply 13398711387e9ce1: Only apply schedTune boost to top-app tasks" am: dce4b65fe0 am: 9babb434ed
am: 321a861b79

Change-Id: I6d870f61a49a69816efd1e5871b394ba715faa70
2017-02-14 09:13:12 +00:00