Commit graph

38340 commits

Author SHA1 Message Date
Christopher Ferris
d41821eade Merge "Add ability to skip function name resolution."
am: 2733708cfb

Change-Id: If75fe6d573d44ddb6ef0e562688bea88654717b3
2018-02-21 20:33:56 +00:00
Christopher Ferris
2733708cfb Merge "Add ability to skip function name resolution." 2018-02-21 20:13:24 +00:00
Andreas Gampe
fdabcbb61a Merge "Base: Add an NDK-compiled version of libbase"
am: 9b4d7dd51e

Change-Id: If0dddc912cdb1aa49ad5c166fc136d2dc9d1896a
2018-02-21 06:45:19 +00:00
Treehugger Robot
9b4d7dd51e Merge "Base: Add an NDK-compiled version of libbase" 2018-02-21 06:37:08 +00:00
Andreas Gampe
af05f3b761 Base: Add an NDK-compiled version of libbase
To support building libraries for CTS.

Bug: 73206894
Bug: 73659009
Test: mmma system/core/base
Change-Id: I630be88f44cf5cefcb13be7959fc1a710686e29b
2018-02-21 01:59:24 +00:00
Christopher Ferris
e4b3a6aaa4 Add ability to skip function name resolution.
Bug: 73558129

Test: New unit tests pass.
Change-Id: I3a6b17d2590aacb367ab3e3a51cc85be73ad64eb
2018-02-20 17:10:23 -08:00
Tom Cherry
4ebf2495a9 Merge "Expose __android_log_buf_print and __android_log_buf_write to NDK"
am: 887b89fe5e

Change-Id: Idbbdf1940d3e6320a5ddb8d56d5ca1510abfb2ce
2018-02-21 01:00:32 +00:00
Treehugger Robot
887b89fe5e Merge "Expose __android_log_buf_print and __android_log_buf_write to NDK" 2018-02-21 00:50:34 +00:00
Tom Cherry
f157725091 Merge "Fix intermittent crash in property_service_test"
am: ca26cbc5d3

Change-Id: Ieaa5218faf9deee0443b88fff6be43d4a0877ec9
2018-02-20 23:04:33 +00:00
Tom Cherry
73ac28b408 Expose __android_log_buf_print and __android_log_buf_write to NDK
These are needed to build libbase with the NDK.

Bug: 73658597
Test: tree hugger
Change-Id: Icf4a82c5c08975731c180be155743ac63f4bfd50
2018-02-20 14:59:28 -08:00
Treehugger Robot
ca26cbc5d3 Merge "Fix intermittent crash in property_service_test" 2018-02-20 20:52:31 +00:00
Tom Cherry
b7ef7e7aff Fix intermittent crash in property_service_test
There is a race in the very_long_name_35166374 test of
property_service.  The test first sends a size value that is beyond
the limit that init will handle, then sends a dummy data value.
However, init closes the socket upon seeing the faulty size, and if
this happens before the test sends the dummy data, the test will crash
due to SIGPIPE.

Since there is no reason to send the dummy data at all, this change no
longer sends it to prevent the crash.  It also now checks explicitly
that init returns an error through the socket.

Bug: 73619375
Test: the unit test in question
Change-Id: I2565a69fa54910cee0e15fc798445e18c91156ec
2018-02-20 10:47:55 -08:00
Elliott Hughes
b57755c429 Merge "bpfmt."
am: 0609e8d231

Change-Id: I810b09372da24d4b84bbeaa5d0c03ec0baf928fd
2018-02-20 02:11:33 +00:00
Treehugger Robot
0609e8d231 Merge "bpfmt." 2018-02-20 02:02:59 +00:00
George Burgess IV
894337ee0b Merge "Fix a memory leak"
am: cb1b68f9b3

Change-Id: Ia7a5fbc737d702615499bccd6492aac9ce3d0ce3
2018-02-19 10:51:47 +00:00
Treehugger Robot
cb1b68f9b3 Merge "Fix a memory leak" 2018-02-19 10:44:43 +00:00
Josh Gao
5504477722 Merge "debuggerd seccomp: explain why we define PROT_READ/WRITE."
am: 665e4c1537

Change-Id: I3762171a451d169d273a4affa3bf3c6eee7a3b3c
2018-02-19 09:49:45 +00:00
Treehugger Robot
665e4c1537 Merge "debuggerd seccomp: explain why we define PROT_READ/WRITE." 2018-02-19 09:43:22 +00:00
Justin Yun
158208cde0 Merge "Define PROT_READ and PROT_WRITE when generating the policy files"
am: a1721a5043

Change-Id: Ibb4459bac1136ce9c54b7a109bb7b7dc72986563
2018-02-19 09:39:05 +00:00
Treehugger Robot
a1721a5043 Merge "Define PROT_READ and PROT_WRITE when generating the policy files" 2018-02-19 09:33:33 +00:00
George Burgess IV
cb2449f851 Fix a memory leak
If create_service_thread fails, we'll leak `arg`.

This fixes a static analyzer complaint:
system/core/adb/services.cpp:298:13: warning: Potential leak of memory
pointed to by 'arg'

Bug: None
Test: Reran the static analyzer. No more complaints about this leak.
Change-Id: I5aec7fd78f2cc775b650501b02bdf0039d1647ca
2018-02-19 01:05:56 -08:00
Josh Gao
edd28f6ede debuggerd seccomp: explain why we define PROT_READ/WRITE.
Add a comment explaining why we define PROT_READ/PROT_WRITE, even
though a current libminijail supports both cosntants.

Bug: http://b/73273658
Test: treehugger
Change-Id: I51c1be1b1b569e94dbc9045a90bc28221b7dc9c7
2018-02-18 23:50:19 -08:00
Justin Yun
40ecb9abf2 Define PROT_READ and PROT_WRITE when generating the policy files
When generating crash_dump.*.policy, replace PROT_READ and PROT_WRITE
to numeric constants to make the policy backward compatible with old
libminijail.so.

Bug: 73273658
Test: use the new policy in OMR1 devices
Change-Id: I936a733340ad4df8aef6562c03eb10c29ffdada2
2018-02-19 10:42:42 +09:00
Christopher Ferris
e89745202c Merge "Modify elf cache to handle elf_offsets properly."
am: 277a95bfef

Change-Id: I71c15df8d527548610cc15484f7c382e85b54552
2018-02-17 03:49:06 +00:00
Christopher Tate
e68fa81351 Merge "Fix darwin build"
am: 8c0c1ba989

Change-Id: I8acb6a80f4ab5458f01fb6196203c4c664438934
2018-02-17 03:46:53 +00:00
Christopher Ferris
277a95bfef Merge "Modify elf cache to handle elf_offsets properly." 2018-02-17 02:00:31 +00:00
Elliott Hughes
dc699a269f bpfmt.
Bug: N/A
Test: builds
Change-Id: I89ad00e1c4c7e0767bc80a7ac7935a4d55e090ac
2018-02-16 17:58:14 -08:00
Treehugger Robot
8c0c1ba989 Merge "Fix darwin build" 2018-02-17 01:45:37 +00:00
Christopher Tate
6983112f59 Fix darwin build
Darwin needs libbase too.

Test: 'm'
Change-Id: I9d50face92b7d5a4399dbcebd39d4062477b3a2c
2018-02-16 14:54:36 -08:00
Christopher Ferris
d9575b668b Modify elf cache to handle elf_offsets properly.
Bug: 73498823

Test: All unit tests pass.
Test: Simpleperf run that previously failed, passes now.
Change-Id: Iff3a1f2f641a46ab9a0326579af3649f0c76fc65
2018-02-16 14:52:38 -08:00
Christopher Ferris
299aa7a646 Merge "Fix soname reading code."
am: 76eda07ff6

Change-Id: I659a84ac44940ac38a8d31f9a5c3cb102435da07
2018-02-16 17:31:25 +00:00
Christopher Ferris
76eda07ff6 Merge "Fix soname reading code." 2018-02-16 17:25:42 +00:00
Elliott Hughes
6737861501 Merge "Include the map name when dumping memory around a register."
am: ffe12c600f

Change-Id: Ide52b02276d39e9c74baf0ab82fc47f144910455
2018-02-16 17:08:38 +00:00
Elliott Hughes
ffe12c600f Merge "Include the map name when dumping memory around a register." 2018-02-16 16:54:34 +00:00
Christopher Ferris
beae42bc7f Fix soname reading code.
The dynamic section contained an address, not an offset into the elf
file to indicate where the soname exists. Changed to use the strtab
entries in the section headers to map this address to the actual offset.

Refactor the soname test a bit to make it easier to verify the code.

Bug: 73499044

Test: Passes new unit tests.
Test: Ran unwind_info on the failing shared elf and verified the soinfo
Test: is correct.
Change-Id: I16ba148389bcb9aadd3566fb442dac27f89fe894
2018-02-15 17:57:13 -08:00
Paul Crowley
cc3e825100 Merge "If enablefilecrypto or init_user0 fails, reboot into recovery."
am: 851803d3cf

Change-Id: I67b0984f6eb77d1f2f3cedc02cfb68941a2c0475
2018-02-16 00:49:36 +00:00
Tom Cherry
44fd091bee Merge changes Iea2d97fb,I08fa3905,Idd5b923e
am: e1ae2ff9e4

Change-Id: Ia21b586491e053c439878c661e056bfd6754f430
2018-02-16 00:45:37 +00:00
Elliott Hughes
e1415a5c3b Include the map name when dumping memory around a register.
Bug: http://b/19590178
Test: ran tests, ran crasher
Change-Id: Ib9afa34c860d8732ef1943eb4decd0b7c8fb55fd
2018-02-15 16:28:50 -08:00
Treehugger Robot
851803d3cf Merge "If enablefilecrypto or init_user0 fails, reboot into recovery." 2018-02-15 21:16:42 +00:00
Paul Crowley
959b055535 If enablefilecrypto or init_user0 fails, reboot into recovery.
Test: Roll back PLATFORM_SECURITY_PATCH, ensure recovery dialog is seen
Bug: 70487538
Change-Id: Iceb6af3f9d6aea6bc646dbb4b5d29dffcb284736
2018-02-15 10:23:52 -08:00
David Sehr
868eac2f94 Merge "Move libdexfile out of runtime"
am: a99ff49ab0

Change-Id: I2c1fc649d7bef7c645e61f6459e77de1257d7b12
2018-02-15 16:46:40 +00:00
Tom Cherry
e1ae2ff9e4 Merge changes Iea2d97fb,I08fa3905,Idd5b923e
* changes:
  Move all Action parsing into ActionParser
  Move ActionManager to its own file
  Move ActionParser to its own file
2018-02-15 16:32:52 +00:00
David Sehr
a99ff49ab0 Merge "Move libdexfile out of runtime" 2018-02-15 16:21:21 +00:00
Luis Hector Chavez
53274d67ff Merge "init.rc: Add nodev,noexec,nosuid to /config"
am: 7238eca684

Change-Id: I72e4b379f2a4fb6f5dadb32410a1f87c658b4ec1
2018-02-15 03:10:29 +00:00
Treehugger Robot
7238eca684 Merge "init.rc: Add nodev,noexec,nosuid to /config" 2018-02-15 03:01:33 +00:00
Tom Cherry
9cbf57048c Move all Action parsing into ActionParser
Bug: 36970783
Test: Build
Change-Id: Iea2d97fb45c3e88bc83fb72d6fa67049be42cfa9
2018-02-14 16:37:17 -08:00
Tom Cherry
7fd3bc27ec Move ActionManager to its own file
Bug: 36970783
Test: build
Change-Id: I08fa39052236b462249f79de1d02bf02bdbf4c84
2018-02-14 16:37:09 -08:00
Luis Hector Chavez
0802d45683 Merge "init.rc: Mount /mnt with nodev,nosuid,noexec"
am: 6698482ca4

Change-Id: I525302301e2812db8b087995c9e4b23d2e0cc966
2018-02-15 00:31:11 +00:00
Treehugger Robot
6698482ca4 Merge "init.rc: Mount /mnt with nodev,nosuid,noexec" 2018-02-15 00:20:12 +00:00
Steven Moreland
23da76e246 Merge "ion_test.c: Fix c/p error in arg parse."
am: f51886bbc4

Change-Id: I91864b299077d374eeccc128b571ee04ea130480
2018-02-14 23:35:44 +00:00