Commit graph

20326 commits

Author SHA1 Message Date
Rubin Xu
a76e171bf3 Merge "Return correct length from pmsgRead()"
am: fc2a8b2bd6

* commit 'fc2a8b2bd605e4639db0feaab49c516c0ae90180':
  Return correct length from pmsgRead()

Change-Id: I868b2ad0258edd409f10fdf8bfb27f44c39de77d
2016-05-09 15:32:15 +00:00
Treehugger Robot
fc2a8b2bd6 Merge "Return correct length from pmsgRead()" 2016-05-09 15:22:43 +00:00
Dimitry Ivanov
9e351d2f2b Merge "Add public libs from an environment variable"
am: c6160d2a0e

* commit 'c6160d2a0ef648ccb3d217c589c60b5c00b80387':
  Add public libs from an environment variable

Change-Id: I2be47c2e9fc02860e7ddd79b97f666c9ea6e881b
2016-05-06 19:56:13 +00:00
Dimitry Ivanov
c6160d2a0e Merge "Add public libs from an environment variable" 2016-05-06 19:44:17 +00:00
Dimitry Ivanov
4ddabd01bf Add public libs from an environment variable
This is enabled only for builds with ro.debuggable=1
It is intended for use only in tests using dalvikvm
and needing access to platform libraries.

Bug: http://b/28449304
Change-Id: I402457d0da542996ccf265aeaa305f09881e4333
2016-05-06 11:39:47 -07:00
Daniel Micay
2f67f4687b Merge "enable integer sanitizer for sdcard service"
am: 532ab82e10

* commit '532ab82e1066837e8a70c64fcee9d083f7cd04b7':
  enable integer sanitizer for sdcard service

Change-Id: Ia732087fed56c1a86303cdd5398bec629ba14e31
2016-05-06 17:05:48 +00:00
Nick Kralevich
532ab82e10 Merge "enable integer sanitizer for sdcard service" 2016-05-06 16:58:56 +00:00
Christopher Ferris
66c17d54e2 Merge "Set groups before dropping privileges."
am: f34304019d

* commit 'f34304019d464de0c03fe62ca7fd9e158afb598c':
  Set groups before dropping privileges.

Change-Id: If5396c913cfed13c01bd06d6a5d781439e5f6876
2016-05-06 01:14:16 +00:00
Treehugger Robot
f34304019d Merge "Set groups before dropping privileges." 2016-05-06 01:08:14 +00:00
Christopher Ferris
05c5ef4757 Merge "Fix null pointer dereference."
am: 830561bb2b

* commit '830561bb2b34ca8c09be4860380e9032202c3112':
  Fix null pointer dereference.

Change-Id: I82a4e97c61c1d3aaef1e4af1292cab06eb804ccc
2016-05-05 22:50:38 +00:00
Christopher Ferris
8b474de4ac Set groups before dropping privileges.
The code for dumping tombstones tries to read the log data. This was
silently failing after the change to drop root privileges. Fix this
by explicitly setting the groups allowed before dropping privileges.

Bug: 28590884
(cherry picked from commit edc2380109)

Change-Id: I225365edccb11f8752027566fd42f3b10ce10260
2016-05-05 15:47:16 -07:00
Treehugger Robot
830561bb2b Merge "Fix null pointer dereference." 2016-05-05 22:44:04 +00:00
Christopher Ferris
157f2725ec Fix null pointer dereference.
In the function dump_thread_info, if /proc/<PID>/comm is unreadable, then
threadname will be used in a strncmp causing a crash. The fix is to
avoid the check if threadname is null.

Bug: 28615417
(cherry picked from commit 039976e553)

Change-Id: I1e61431b1549ecfdc49a72cbf193a364069cda79
2016-05-05 14:21:25 -07:00
Christopher Ferris
9c02f2379f Merge "Fix problem with wait_for_gdb."
am: d494665822

* commit 'd4946658225e7fdb12219924357814fcc0cd3cf9':
  Fix problem with wait_for_gdb.

Change-Id: If9ae01ddd02739cdb3ccbdde1b11c9ec8375fe7e
2016-05-05 20:36:06 +00:00
Treehugger Robot
d494665822 Merge "Fix problem with wait_for_gdb." 2016-05-05 20:27:30 +00:00
Daniel Micay
83c0c7b2ab enable integer sanitizer for sdcard service
The previous false positive fix (df9c4a01) is enough to pass tests, and
it doesn't appear that there are any remaining issues.

Change-Id: Ib9812f1201ff0cd2ae8c8371737754fc328765b5
2016-05-05 16:03:32 -04:00
Christopher Ferris
99235e9967 Fix problem with wait_for_gdb.
When someone enables wait_for_gdb, activity manager will kill the
stopped process before a developer can attach to the process. To
allow debugging in this case, change the code to only contact the
activity manager right before continuing the process that is
crashing.

Also, modify the conditions under which to do a gdb attach. The previous
code did a partial attach if perform_dump failed. The new version simply
allows an attach regardless of whether perform_dump passes or fails.

Bug: 28409358
(cherry picked from commit 9818bd2bbe)

Change-Id: I42f464b69332748e16b07d9d00f44b3aa26ce8b7
2016-05-05 10:50:39 -07:00
Rubin Xu
9c2f803e9d Return correct length from pmsgRead()
Bug: 28610769
Change-Id: I38cac786ca43ef8d9530f4e2e5a0bdd4cc3bccef
2016-05-05 16:50:44 +01:00
Elliott Hughes
e9e8b44d5a Merge "Lose ps to toybox."
am: 31701d6074

* commit '31701d6074effb399cf717da21abde91d7e29dd7':
  Lose ps to toybox.

Change-Id: I5b24a54c4e9a7e64853c71d13256aa6cf89ca0ac
2016-05-05 00:36:09 +00:00
Elliott Hughes
31701d6074 Merge "Lose ps to toybox." 2016-05-05 00:29:12 +00:00
Dimitry Ivanov
9fad128a16 Merge "nativeloader: Add CloseNativeLibrary() method"
am: ad717d6566

* commit 'ad717d6566eb381fb0ef47941c000789f048cf81':
  nativeloader: Add CloseNativeLibrary() method

Change-Id: Id4a0937a32afe189c5cb46367d91a2aeebbfb71d
2016-05-04 23:44:28 +00:00
Treehugger Robot
ad717d6566 Merge "nativeloader: Add CloseNativeLibrary() method" 2016-05-04 23:38:55 +00:00
Dimitry Ivanov
7a1f9518f7 nativeloader: Add CloseNativeLibrary() method
This method is called by art on UnloadNativeLibraries()

Bug: http://b/28406866
Change-Id: Ibccff93c83d6ccd3d0a1c0294a64b09281b4e05e
(cherry picked from commit 09a516bf16)
2016-05-04 15:26:33 -07:00
Elliott Hughes
eea3c0e601 Lose ps to toybox.
Change-Id: I890a453533e1b3066169738f55314f8813285c17
2016-05-04 15:20:02 -07:00
Elliott Hughes
ee3202563b Merge "Remove <utils/ashmem.h>."
am: f9f76146a1

* commit 'f9f76146a1d0f05654be8963e78c2ed6c56d4a57':
  Remove <utils/ashmem.h>.

Change-Id: I2404bef3218617fb06dcb62f52717f61d83f52d8
2016-05-04 22:01:36 +00:00
Elliott Hughes
f9f76146a1 Merge "Remove <utils/ashmem.h>." 2016-05-04 21:48:21 +00:00
Elliott Hughes
6d7823a54e Remove <utils/ashmem.h>.
Not to be confused with <cutils/ashmem.h> or <linux/ashmem.h>, one or other
of which is what you should be using instead.

Change-Id: Ie158530591b28b94c2cda9e2686cae56b7aeb1a3
2016-05-04 13:33:20 -07:00
Michael Ryleev
97d33dc5b0 Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10
am: 09167c2f5c

* commit '09167c2f5cfbc75441d34372a1f0cb1b82c32aa2':
  trusty: storage: implement storage proxy daemon
  trusty: storage: add trusty interface header
  trusty: add trusty-base.mk
  trusty: add keymaster module
  trusty: add gatekeeper module

Change-Id: Ib6576b95a4badf0885a8b922722ec5d9146843a1
2016-05-03 20:05:00 +00:00
Michael Ryleev
09167c2f5c Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10
* changes:
  trusty: storage: implement storage proxy daemon
  trusty: storage: add trusty interface header
  trusty: add trusty-base.mk
  trusty: add keymaster module
  trusty: add gatekeeper module
2016-05-03 19:56:08 +00:00
Michael Ryleev
f59560df2c trusty: storage: implement storage proxy daemon
Change-Id: I80cdf61e5ced00dd32a3e35eb81969d25b624df9
2016-05-02 15:12:01 -07:00
Andres Morales
117b1307d9 trusty: storage: add trusty interface header
Change-Id: I9885cc8d4204690690b384bbf209f82cb64f9265
2016-05-02 15:12:01 -07:00
Michael Ryleev
aedf9af3ec trusty: add trusty-base.mk
The trusty-base.mk should be included by devices that use
Trusty TEE to pull in the baseline set of Trusty specific modules.

Change-Id: I47c2095a21f47a40d390c9d5426380ad9507a708
2016-05-02 15:12:01 -07:00
Andres Morales
95989dbb0f trusty: add keymaster module
Change-Id: Id240b1b33e07d4cb3ea9d188014701e3d2b3c477
2016-05-02 15:12:01 -07:00
Andres Morales
1571f47f3c trusty: add gatekeeper module
Change-Id: I3e468c103326e6a9147dbed6c803748ffd5e207a
2016-05-02 15:12:01 -07:00
Dimitry Ivanov
75701b0d60 Merge "nativeloader: Add Reset capabilities"
am: 27d75e8bc1

* commit '27d75e8bc11985e2f3de5aa2811749f53a109a41':
  nativeloader: Add Reset capabilities

Change-Id: I32eb61966c3cdbeef3ac909fcd402447929af40e
2016-05-02 21:37:05 +00:00
Dimitry Ivanov
27d75e8bc1 Merge "nativeloader: Add Reset capabilities" 2016-05-02 21:31:49 +00:00
Dimitry Ivanov
911472da85 nativeloader: Add Reset capabilities
In the case when VM is restarted all weak references
from the old VM become invalid. In such event NativeLoader
needs to clear the list of classloaders from old VM.

Bug: http://b/28453840
Bug: http://b/28449304
Change-Id: I2268c1e21cf940c57ddc5f0312f56b71aa702134
(cherry picked from commit be4ca3afc0)
2016-05-02 13:35:32 -07:00
Elliott Hughes
755244f9d8 Merge "Remove useless #include."
am: bfd6a0f24d

* commit 'bfd6a0f24dbcf00db61c283249e5e5a4f6a9d8a6':
  Remove useless #include.

Change-Id: Iba9b7b481b83c4bf7707d38844f39bdb0d383164
2016-04-30 17:59:35 +00:00
Elliott Hughes
bfd6a0f24d Merge "Remove useless #include." 2016-04-30 17:56:26 +00:00
Elliott Hughes
fc6a71f2fa Merge "toolbox ps: replace strcpy with snprintf."
am: b9ce0f10f3

* commit 'b9ce0f10f38c74b468c4bc512b3cc82c4bba0e1b':
  toolbox ps: replace strcpy with snprintf.

Change-Id: I7819d42e1780f9bab14bdfee882a074f3677df00
2016-04-30 16:11:55 +00:00
Elliott Hughes
c4248ae9a1 Remove useless #include.
Bug: http://b/28432688
Change-Id: I8982f42b2bf2305168a4ba167e422173f35c69c2
2016-04-30 09:10:07 -07:00
Elliott Hughes
b9ce0f10f3 Merge "toolbox ps: replace strcpy with snprintf." 2016-04-30 16:07:10 +00:00
Chih-Hung Hsieh
427d8d840f Merge "Fix google-explicit-constructor warnings."
am: 7bdd6a8b5a

* commit '7bdd6a8b5a24214ae9f8d47b0236c1bcd6319c89':
  Fix google-explicit-constructor warnings.

Change-Id: Ie9d7cf9d055a8025b5bad65d3e4fcff6174e1bfd
2016-04-30 05:14:21 +00:00
Elliott Hughes
defd249d3d toolbox ps: replace strcpy with snprintf.
Change-Id: I0fdf9a8d5ab15bcff06cca3f3e7024ab76b219d9
2016-04-29 22:10:40 -07:00
Chih-hung Hsieh
7bdd6a8b5a Merge "Fix google-explicit-constructor warnings." 2016-04-30 05:10:05 +00:00
Colin Cross
2d523d0cc5 Merge changes Ied2ab927,I16245af7
am: 3b9ba98e9e

* commit '3b9ba98e9eda85baa6f08409177fd1f23307b2d0':
  Silently ignore duplicate heap entries
  Handle segfaults while walking native heap

Change-Id: I8d240cc6cd4b8ffe37a7ea68587546634cb756c9
2016-04-29 23:22:05 +00:00
Treehugger Robot
3b9ba98e9e Merge changes Ied2ab927,I16245af7
* changes:
  Silently ignore duplicate heap entries
  Handle segfaults while walking native heap
2016-04-29 23:16:39 +00:00
Chih-Hung Hsieh
1c563d96f0 Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I4504e98a8db31e0edcbe63c23f9af43eb13e9d86
2016-04-29 15:44:04 -07:00
Colin Cross
583a250830 Silently ignore duplicate heap entries
Vendor blobs on ryu mprotect heap pages, causing a single chunk mapping
to appear as multiple mappings.  The heap iterator has to expand the
requested range to cover the beginning of the chunk to find the chunk
metadata, which will lead to duplicate identical allocations being
reported from iterating over each of the split mappings.  Silently
ignore identical allocations, and only warn on non-identical allocations
that overlap.

Bug: 28269332
Change-Id: Ied2ab9270f65d00a887c7ce1a93fbf0617d69be0
(cherry picked from commit cecd64012d)
2016-04-29 15:14:06 -07:00
Colin Cross
0965c0247b Handle segfaults while walking native heap
Vendor blobs on ryu mprotect heap pages, causing segfaults when dumping
unreachable memory.  Handle segfaults within HeapWalker by mapping a
zero page over any unreadable pages.  HeapWalker runs in the forked
process, so the mapping will not affect the original process.

Bug: 28269332
Change-Id: I16245af722123f2ad467cbc6f245a70666c55544
(cherry picked from commit ba5d9ff6d9)
2016-04-29 15:14:06 -07:00