Commit Graph

30216 Commits

Author SHA1 Message Date
Steven Moreland 5717abf233 Merge "RefBase.cpp remove unused include typeinfo" am: 141e98474e am: d253899e1e am: 1bc2c960ee
am: 878f0c6bd6

Change-Id: I8230b912145a755c7c36bd4b3f3c26784c35e19a
2017-02-16 05:35:44 +00:00
Steven Moreland 878f0c6bd6 Merge "RefBase.cpp remove unused include typeinfo" am: 141e98474e am: d253899e1e
am: 1bc2c960ee

Change-Id: I747b0473045f29f1a46e805876faa3ba2cc0a284
2017-02-16 05:31:37 +00:00
Steven Moreland 1bc2c960ee Merge "RefBase.cpp remove unused include typeinfo" am: 141e98474e
am: d253899e1e

Change-Id: I70bfe86735ea1ff4363e805509b5a45c00ffe70c
2017-02-16 05:27:37 +00:00
Steven Moreland d253899e1e Merge "RefBase.cpp remove unused include typeinfo"
am: 141e98474e

Change-Id: I8a7780301273ebeba0e50470a138bf9f58eda90a
2017-02-16 05:24:07 +00:00
Treehugger Robot 141e98474e Merge "RefBase.cpp remove unused include typeinfo" 2017-02-16 05:17:43 +00:00
Josh Gao 2fbbc1eb49 Merge changes from topic 'debuggerd_snprintf' am: fefda6b508 am: 8de67e537f am: e5b6b89908
am: 1eb2cb190f

Change-Id: Idfc018b573ec05815bf6a722ae8a5d2f48728923
2017-02-16 04:00:19 +00:00
Josh Gao 27fce2ce38 debuggerd_handler: don't use snprintf in handler. am: 60515bf9f1 am: 021028e020 am: 7e26f7e0bb
am: df2192d259

Change-Id: I5a54370da4c600fdef92992f4c19c3f131cc9148
2017-02-16 04:00:11 +00:00
Josh Gao 1eb2cb190f Merge changes from topic 'debuggerd_snprintf' am: fefda6b508 am: 8de67e537f
am: e5b6b89908

Change-Id: I4d9ec396dabfeab1a7b343c784a1c068cd036c96
2017-02-16 03:56:44 +00:00
Josh Gao df2192d259 debuggerd_handler: don't use snprintf in handler. am: 60515bf9f1 am: 021028e020
am: 7e26f7e0bb

Change-Id: I1b4a30a85374a2874322804dbe5f1fa88d6799a3
2017-02-16 03:56:38 +00:00
Josh Gao e5b6b89908 Merge changes from topic 'debuggerd_snprintf' am: fefda6b508
am: 8de67e537f

Change-Id: Ifc47ccc698724f6222f2f7b9beb984e0cfdf3c21
2017-02-16 03:53:45 +00:00
Josh Gao 7e26f7e0bb debuggerd_handler: don't use snprintf in handler. am: 60515bf9f1
am: 021028e020

Change-Id: Ica000fc4c7a6ac8a5f038629340a34dfa453abea
2017-02-16 03:53:39 +00:00
Josh Gao 8de67e537f Merge changes from topic 'debuggerd_snprintf'
am: fefda6b508

Change-Id: I8ea82692779d531c453b50ffd45309317e9a4f0f
2017-02-16 03:50:22 +00:00
Josh Gao 021028e020 debuggerd_handler: don't use snprintf in handler.
am: 60515bf9f1

Change-Id: I2407ec35721a3365609d33b2b1531c5fb0b0d7c9
2017-02-16 03:50:13 +00:00
Josh Gao fefda6b508 Merge changes from topic 'debuggerd_snprintf'
* changes:
  crash_dump: fix typos in error messages.
  debuggerd_handler: don't use snprintf in handler.
2017-02-16 03:42:53 +00:00
Steven Moreland 1a055a8957 RefBase.cpp remove unused include typeinfo
Test: pass
Change-Id: Iec9b9e1e9b6c974124b2043f550fb110cc22846d
2017-02-15 19:04:40 -08:00
Sandeep Patil cf3aaff376 Merge "fs_mgr: remove code that gets slot_suffix from misc partition" am: 5a306ec6ab am: 622a82f2f4 am: e48db65732
am: a1e081f4a4

Change-Id: Iea7a3ad542c50fc378e44161cedc76a5ad8b116f
2017-02-16 03:01:43 +00:00
Sandeep Patil a1e081f4a4 Merge "fs_mgr: remove code that gets slot_suffix from misc partition" am: 5a306ec6ab am: 622a82f2f4
am: e48db65732

Change-Id: I05e65e491d7b8ffdc5fad74245cbb1466a2815ed
2017-02-16 02:58:02 +00:00
Sandeep Patil e48db65732 Merge "fs_mgr: remove code that gets slot_suffix from misc partition" am: 5a306ec6ab
am: 622a82f2f4

Change-Id: I5b0727d9d30881d4c736e4d1d23240cba25afa0f
2017-02-16 02:53:27 +00:00
Sandeep Patil 622a82f2f4 Merge "fs_mgr: remove code that gets slot_suffix from misc partition"
am: 5a306ec6ab

Change-Id: Ic4ff45ddfbec1c1a68a1f7d0b58a2df5a036922a
2017-02-16 02:47:58 +00:00
Treehugger Robot 5a306ec6ab Merge "fs_mgr: remove code that gets slot_suffix from misc partition" 2017-02-16 02:32:33 +00:00
Josh Gao f6ad5851e6 crash_dump: fix typos in error messages.
Bug: http://b/34760032
Bug: http://b/35367169
Test: mm
Change-Id: I45fa002d4ca616a41524583228987ab1197a125e
2017-02-15 17:03:30 -08:00
Sandeep Patil d529d9d358 fs_mgr: remove code that gets slot_suffix from misc partition
'slot_suffix' for A/B devices *must* be provided in kernel command line
or in device tree. The removed code was unnecessarily looking it up in
the 'misc' partition.

b/33254008

Test: Boot sailfish

Change-Id: I329af2d9a98c34a941596779eb78d14337b864e5
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-02-15 16:00:03 -08:00
Greg Hackmann 3ce7d82aa3 Merge "libadf: support ADF_{POST,SIMPLE_POST}_CONFIG_V2 ioctls" am: 64fc7442db am: e36bede288 am: cced4446db
am: 2437ae16f5

Change-Id: I5aaf26e85d12814169bc99361ccae6cde0841292
2017-02-15 23:06:06 +00:00
Greg Hackmann 2437ae16f5 Merge "libadf: support ADF_{POST,SIMPLE_POST}_CONFIG_V2 ioctls" am: 64fc7442db am: e36bede288
am: cced4446db

Change-Id: I9e511e4852a9a87e8da0abebdb06f1b52e7614ab
2017-02-15 22:48:04 +00:00
Greg Hackmann cced4446db Merge "libadf: support ADF_{POST,SIMPLE_POST}_CONFIG_V2 ioctls" am: 64fc7442db
am: e36bede288

Change-Id: I6415b33d8a9b3319a3feb9736f18ead9c9eee859
2017-02-15 22:40:36 +00:00
Greg Hackmann e36bede288 Merge "libadf: support ADF_{POST,SIMPLE_POST}_CONFIG_V2 ioctls"
am: 64fc7442db

Change-Id: Id166b75f86da4c510ddc59462213b2e897932937
2017-02-15 22:33:15 +00:00
Brian C. Anderson 044dd001e9 Merge "Add NATIVE_WINDOW_GET_COMPOSITOR_TIMING" 2017-02-15 22:32:45 +00:00
Keun-young Park 8c08bad700 Merge "Revert "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"" am: cbb91a538f am: b2ce87de12 am: 12e13e172d
am: ec647d5639

Change-Id: I8247218bcbea28f89ff8e58f3a1cda68216d3c9c
2017-02-15 21:56:22 +00:00
Treehugger Robot 64fc7442db Merge "libadf: support ADF_{POST,SIMPLE_POST}_CONFIG_V2 ioctls" 2017-02-15 21:42:48 +00:00
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 bfb571835e Merge "debuggerd_handler: set PR_SET_DUMPABLE before running crash_dump." am: af776fd518 am: 877becaf7e am: 274eb16422
am: 45499618b3

Change-Id: I6c0f89871190e99a8129128ffb7a79027b8f8a4d
2017-02-15 07:37:07 +00: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 68b4399202 Merge changes I32567010,I400d5991 am: 1d26b40ed5 am: 1e4efdaeac am: 2e0997bccd
am: 2a80862300

Change-Id: I7f836dea2e4976896d68ea9c382ed07144862b9d
2017-02-15 05:33:26 +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 0d4c481692 Merge "Only sanitize Android." am: a22ce825e6 am: 98536b07fc am: 9297e0e314
am: aa126445cb

Change-Id: I4a848869ed69f37264867cc2d1df451be6003709
2017-02-15 01:46:43 +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