Commit graph

27657 commits

Author SHA1 Message Date
James Hawkins
39ce80f0e0 Merge "Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime."" am: 23f4e6b0a5
am: cefdacef3c

Change-Id: I1d98832897a49f8bf013476b65afe31768ff03d4
2017-02-09 02:34:07 +00:00
James Hawkins
cefdacef3c Merge "Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime.""
am: 23f4e6b0a5

Change-Id: Ibef66ccd1a1fe362692ee45cb86cd9c0212c1f85
2017-02-09 02:31:44 +00:00
James Hawkins
23f4e6b0a5 Merge "Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime."" 2017-02-09 00:12:54 +00:00
James Hawkins
0e3167e203 Revert "bootstat: Remove custom uptime parser in favor of elapsedRealtime."
This reverts commit 26f40c04c3.

This change broke the Darwin SDK target.

Test: none
Change-Id: Ia54fe2c31da8d8fa2825e023b035fb8321dcd457
2017-02-08 14:16:51 -08:00
Josh Gao
b46e50b54d Merge changes I1a28c21c,I02faec3b,I16a2050b am: ec5d6cb8fd
am: c2d9b60e0a

Change-Id: Ifccdd41a09910e16967d9a9239522bcac3def4fc
2017-02-08 19:39:39 +00:00
Josh Gao
f0d7738ceb crash_dump: collect open files before dropping caps. am: c24cc8a9e5
am: db22633766

Change-Id: I1ec8a4c08945d446e036faf54e19de62b3c8d703
2017-02-08 19:39:33 +00:00
Josh Gao
5c52c64d65 debuggerd_test: improve error when crasher fails to exec. am: 7a0ee64f9d
am: 1255609232

Change-Id: I619349ca675b6f1dd1116bd2c2f40d2a293198b3
2017-02-08 19:39:28 +00:00
Josh Gao
2d8c689280 debuggerd_test: fix crasher path. am: a7d7eb6d2a
am: 8c1ebc6037

Change-Id: Iaff476ccb8b89e74867c0ba2a58f1d2f255bf3c3
2017-02-08 19:39:23 +00:00
Josh Gao
c2d9b60e0a Merge changes I1a28c21c,I02faec3b,I16a2050b
am: ec5d6cb8fd

Change-Id: I77a30bdf59ae0ec156d8ab2b9ad69b050e3e9ec2
2017-02-08 19:37:12 +00:00
Josh Gao
db22633766 crash_dump: collect open files before dropping caps.
am: c24cc8a9e5

Change-Id: Ic27d13c1132e8dc6f3a36757e56eff4af65c55c4
2017-02-08 19:37:11 +00:00
Josh Gao
1255609232 debuggerd_test: improve error when crasher fails to exec.
am: 7a0ee64f9d

Change-Id: I6c07c11094e67f502c7d2cd71dac0cbf78e7d422
2017-02-08 19:37:06 +00:00
Josh Gao
8c1ebc6037 debuggerd_test: fix crasher path.
am: a7d7eb6d2a

Change-Id: Ie87aa723909ea7eb9ce7fef17c9145fc8ce11b42
2017-02-08 19:37:00 +00:00
Josh Gao
ec5d6cb8fd Merge changes I1a28c21c,I02faec3b,I16a2050b
* changes:
  crash_dump: collect open files before dropping caps.
  debuggerd_test: improve error when crasher fails to exec.
  debuggerd_test: fix crasher path.
2017-02-08 19:31:57 +00:00
James Hawkins
5078d30bc6 Merge "bootstat: Remove custom uptime parser in favor of elapsedRealtime." am: 914955ae9e
am: cdfe67f575

Change-Id: Icf0af3e8a46e4e3fee9f3364fd26a31c9420c7b7
2017-02-08 18:33:49 +00:00
Ting-Yuan Huang
327cd83060 Merge "liblog: fix an undefined-behavor in __write_to_log_daemon()" am: a3b6d30ba7
am: 68a6676c77

Change-Id: I689a3b632393651eeee6272095b4d1a28633393d
2017-02-08 18:33:37 +00:00
Ting-Yuan Huang
9948979130 Merge "liblog: fix a memory leak in __android_log_pmsg_file_write()" am: a8629e8e15
am: 161953f49c

Change-Id: I40f2c5f37e681bb6c2df3e985a9f9d6841df9178
2017-02-08 18:33:24 +00:00
James Hawkins
cdfe67f575 Merge "bootstat: Remove custom uptime parser in favor of elapsedRealtime."
am: 914955ae9e

Change-Id: I5565b341338f75e9dbdd8405b07419219f61a940
2017-02-08 17:32:47 +00:00
Ting-Yuan Huang
68a6676c77 Merge "liblog: fix an undefined-behavor in __write_to_log_daemon()"
am: a3b6d30ba7

Change-Id: I5a50c19876333dfec5445838e6bcd3c406cdc5b2
2017-02-08 17:32:32 +00:00
Treehugger Robot
914955ae9e Merge "bootstat: Remove custom uptime parser in favor of elapsedRealtime." 2017-02-08 17:28:12 +00:00
Treehugger Robot
a3b6d30ba7 Merge "liblog: fix an undefined-behavor in __write_to_log_daemon()" 2017-02-08 17:21:58 +00:00
Ting-Yuan Huang
161953f49c Merge "liblog: fix a memory leak in __android_log_pmsg_file_write()"
am: a8629e8e15

Change-Id: I9eabd9930467bd540dbc603e68c3dcca4ba452df
2017-02-08 17:20:49 +00:00
Treehugger Robot
a8629e8e15 Merge "liblog: fix a memory leak in __android_log_pmsg_file_write()" 2017-02-08 16:50:09 +00:00
Ting-Yuan Huang
6efb877973 liblog: fix an undefined-behavor in __write_to_log_daemon()
The behavior of passing NULL to c-string functions is undefined.

Test: passed clang-tidy checks
Bug: none

Change-Id: Ie7bcc43cd19bc4a1c314381af3929eae0a6154b9
2017-02-07 16:42:53 -08:00
Ting-Yuan Huang
106c3e6189 liblog: fix a memory leak in __android_log_pmsg_file_write()
Free the strdup()-ed filename before returning error.

Test: passed clang-tidy checks
Bug: none
Change-Id: I555492cb4e50400db758f7c721647a8747874a01
2017-02-07 15:53:32 -08:00
Mark Salyzyn
4ef3bd1cd9 Merge "liblog: logger.h fortify comments" am: 8eb237ad57
am: a8c7b6e24f

Change-Id: Ia220a9fe3dfde209a7ace83dfedb3715d778bd1f
2017-02-07 23:49:40 +00:00
James Hawkins
26f40c04c3 bootstat: Remove custom uptime parser in favor of elapsedRealtime.
Refactored init/utils/boot_clock into base/chrono_utils.

Bug: 34352037
Test: none
Change-Id: Ied0c00867336b85922369d7ff37520e3d28fc61e
2017-02-07 15:43:32 -08:00
Mark Salyzyn
a8c7b6e24f Merge "liblog: logger.h fortify comments"
am: 8eb237ad57

Change-Id: Ifedfe4ab79a915c712e4e4f967e6dd5514dbd6ff
2017-02-07 23:42:31 +00:00
Mark Salyzyn
8eb237ad57 Merge "liblog: logger.h fortify comments" 2017-02-07 23:36:55 +00:00
Mark Salyzyn
7048f0b1cb liblog: logger.h fortify comments
Test: none
Bug: 27405083
Change-Id: I88ae9f33daa457454edfc5e95cb9e9e74e8cd5f0
2017-02-07 14:16:09 -08:00
Josh Gao
c24cc8a9e5 crash_dump: collect open files before dropping caps.
/proc/<pid>/fd is also limited by ptrace_may_access.

Test: manual inspection of "debuggerd -b `pidof zygote`"
Change-Id: I1a28c21c0438fe8729bd8e041c6b418d6a84c586
2017-02-07 13:36:08 -08:00
Josh Gao
7a0ee64f9d debuggerd_test: improve error when crasher fails to exec.
Bug: http://b/35100742
Test: rm /system/bin/crasher && /data/nativetest/debugerd_test/debuggerd_test32
Change-Id: I02faec3b7f7ef62bb8a2ac2af730506e3d28e03e
2017-02-07 13:36:08 -08:00
Josh Gao
a7d7eb6d2a debuggerd_test: fix crasher path.
https://android-review.googlesource.com/#/c/331200 moved crasher to
using soong, which changed its location from /system/xbin/crasher to
/system/bin/crasher.

Bug: http://b/35100742
Test: /data/nativetest/debuggerd_test/debuggerd_test32
Test: /data/nativetest64/debuggerd_test/debuggerd_test64
Change-Id: I16a2050b257277023773cc0c960b5ab36e0c7cd4
2017-02-07 13:13:48 -08:00
Elliott Hughes
9daec1f94d Merge "Don't print 168^W143 lines of help when someone makes a typo." am: 887b6b9a4b
am: fde95b8844

Change-Id: I4b3f236bf46be66e124d52b404a77e174b1db7b3
2017-02-07 20:56:40 +00:00
Elliott Hughes
fde95b8844 Merge "Don't print 168^W143 lines of help when someone makes a typo."
am: 887b6b9a4b

Change-Id: I2fbdad1f5ec9d7b7084384a01ad34679cf74bd09
2017-02-07 20:54:09 +00:00
Elliott Hughes
887b6b9a4b Merge "Don't print 168^W143 lines of help when someone makes a typo." 2017-02-07 20:51:41 +00:00
Josh Gao
257366f24e Merge "crash_dump: read /proc/<pid>/maps before dropping capabilities." am: 59b8e35939
am: 2eefb47ae3

Change-Id: I3a6123f1e468d03ed20d5269b5210c5f76959947
2017-02-07 20:47:09 +00:00
Josh Gao
2eefb47ae3 Merge "crash_dump: read /proc/<pid>/maps before dropping capabilities."
am: 59b8e35939

Change-Id: I5ee0d4d791ae17b4f3c3eff985d8f94938dbbe19
2017-02-07 20:44:38 +00:00
Josh Gao
59b8e35939 Merge "crash_dump: read /proc/<pid>/maps before dropping capabilities." 2017-02-07 20:41:16 +00:00
Josh Gao
347164cc59 crash_dump: read /proc/<pid>/maps before dropping capabilities.
Reading /proc/<pid>/maps does a ptrace_may_access check, which will
fail if we have fewer capabilities than the target, even if we've
already ptraced it.

Bug: http://b/35070339
Test: debuggerd -b `pidof zygote`
Change-Id: I984a061022bd945a7950b88f6d579e1bd735e893
2017-02-07 12:35:51 -08:00
Elliott Hughes
a7063b8257 Merge "Make __android_log_assert behave more like libc asserts." am: 9df286012c
am: ad2927d744

Change-Id: I174f78fcd9007a6af42046a16d44ac458b7f5bcb
2017-02-07 17:06:01 +00:00
Elliott Hughes
ad2927d744 Merge "Make __android_log_assert behave more like libc asserts."
am: 9df286012c

Change-Id: I20003b781eb402d4cc3420d1d2b20aeca8faf978
2017-02-07 17:04:02 +00:00
Elliott Hughes
9df286012c Merge "Make __android_log_assert behave more like libc asserts." 2017-02-07 17:01:16 +00:00
Josh Gao
dd0aebcb62 Merge "debuggerd_handler: fix prctl return value check." am: 36b8ccb9b2
am: f18d64b2d6

Change-Id: Ic0185b883ef08d68d587346eb9a92c5703ea71c5
2017-02-07 06:44:51 +00:00
Josh Gao
f18d64b2d6 Merge "debuggerd_handler: fix prctl return value check."
am: 36b8ccb9b2

Change-Id: Ic4ede60f39dc5802d51f682cd69e88534087886a
2017-02-07 06:42:20 +00:00
Josh Gao
36b8ccb9b2 Merge "debuggerd_handler: fix prctl return value check." 2017-02-07 06:37:09 +00:00
Josh Gao
54ef57d0b8 debuggerd_handler: fix prctl return value check.
Fixed this when I tested on internal, but failed to copy the fix over
when submitting to AOSP.

Bug: http://b/35070339
Test: `adb bugreport` on angler
Change-Id: Ib84d212e5f890958cd21f5c018fbc6f368138d1e
2017-02-06 21:10:48 -08:00
Elliott Hughes
2ec36b0da0 Don't print 168^W143 lines of help when someone makes a typo.
Print actual usage messages in most cases.

Add --help and --version.

Bug: http://b/28054087
Test: manual
Change-Id: I39c1cb7a84f52e0c35d24f140ec55c3a181283fb
2017-02-06 16:20:30 -08:00
Dimitry Ivanov
d6fc63c8ef Merge "Log errors from loading public libraries" am: 6b74258818
am: 1508020656

Change-Id: I0c646bd55d21e5caf2fd6278de42ab177dca117c
2017-02-06 21:12:24 +00:00
Dimitry Ivanov
1508020656 Merge "Log errors from loading public libraries"
am: 6b74258818

Change-Id: I3f55cdcb6c1dd194a62f6074501ebd97a7312d85
2017-02-06 21:10:43 +00:00
Dimitry Ivanov
6b74258818 Merge "Log errors from loading public libraries" 2017-02-06 21:05:02 +00:00