Commit Graph

19979 Commits

Author SHA1 Message Date
Nick Kralevich 780883e33c Merge "init: harden socket creation against symlinks"
am: 0f565c1ea4

* commit '0f565c1ea48aa625d4a6b2c342fd61bcbc9ca868':
  init: harden socket creation against symlinks
2016-02-25 20:40:10 +00:00
Nick Kralevich 0f565c1ea4 Merge "init: harden socket creation against symlinks" 2016-02-25 20:39:45 +00:00
Nick Kralevich 9bcfd64b59 init: harden socket creation against symlinks
Instead of using chown, use the symlink safe lchown.

Instead of using chmod, use the symlink safe fchmodat
with AT_SYMLINK_NOFOLLOW.

Fix a bug where the SELinux filesystem creation context may
not be restored, and some memory not freed, if bind() fails.

Check the return values from the chown/chmod calls and unlink
the files if it ever fails.

(cherrypicked from commit ab5629c197)

Bug: 27337831
Change-Id: I28c5f4dee55aa706437eb51ad403c1fbf56138de
2016-02-25 12:38:51 -08:00
Mark Salyzyn 81f407be36 liblog: __android_log_error_write use event list library
Switch to the event list library to compose the associated event.

SideEffects: Instead of composing event on a stack buffer of 512
             bytes in size, a PAGE is allocated temporarily.

Bug: 27356456
Change-Id: Ic15a87f49385834c2287ed82c26439b2c5eb4f77
2016-02-25 12:29:32 -08:00
Mark Salyzyn 5cecedc6e8 liblog: test: __android_log_error_write accuracy
Add a test to confirm exact expected content using the testframe
setup for the events log handler. Remove dependency on 512 truncation
in liblog->
android_errorWriteWithInfoLog__android_logger_list_read__data_too_large
to something more liberal.

Bug: 27356456
Change-Id: I8a53ad3a16cf16b14856efe5b95417e857c7e09b
2016-02-25 12:29:32 -08:00
Mark Salyzyn 67d7eafd56 liblog: add android_log_write_string8_len
android_log_write_string8_len(android_log_context ctx,
                              const char *value, size_t maxlen)

Caps the supplied string to a maxlen length. Alter API to handle
a NULL pointer for the value string for this and
android_log_write_string8() and instead of returning -EINVAL,
act like a null string "" was supplied to preserve the list
location. API is also changed to report the number of characters
actually placed into the android_log_context.

Bug: 27356456
Bug: 19235719
Change-Id: I6a03d405eac1d741555dd05555513ec691e7a46e
2016-02-25 12:29:32 -08:00
Steve Fung 557152a97a Merge "crash_reporter: Fix product_id in kernel crash reports"
am: 2681515100

* commit '26815151008e863b754506da4a2ac7da471672c9':
  crash_reporter: Fix product_id in kernel crash reports
2016-02-25 20:22:24 +00:00
Steve Fung 2681515100 Merge "crash_reporter: Fix product_id in kernel crash reports" 2016-02-25 20:20:25 +00:00
Yusuke Sato 4e30b63fc6 Merge "Use ro.debuggable instead of ro.build.type"
am: 37c90df931

* commit '37c90df93111b5ce08720f8c614dd9e946679ac4':
  Use ro.debuggable instead of ro.build.type
2016-02-25 19:34:27 +00:00
Yusuke Sato 37c90df931 Merge "Use ro.debuggable instead of ro.build.type" 2016-02-25 19:32:57 +00:00
James Hawkins 9336b613ca libpixelflinger: Fix -Woverloaded-virtual warnings.
GGLAssembler inherits a reset method from two parent classes, but it
provides a separate reset method with a different signature, thus hiding
the inherited reset methods.

The fix is to explicitly hide the inherited reset methods as private.

Bug: 27346663
Change-Id: Ic64b00acb6d77fb791cfdeade9ef7e20148817c1
2016-02-25 10:59:30 -08:00
Yusuke Sato 246b0fd0d9 Use ro.debuggable instead of ro.build.type
Change-Id: I4d7c8c353ff47fbeee065b2c4fdd984768d0da00
2016-02-25 10:53:55 -08:00
Josh Gao 2b7f69d0f1 Merge "adb: bail out if wait_for_device fails in send_shell_command."
am: 4e5b292299

* commit '4e5b2922991dddf03c122963fb197968de5764e3':
  adb: bail out if wait_for_device fails in send_shell_command.
2016-02-25 18:46:40 +00:00
Josh Gao 2ea5bf7b55 Merge "adb: fix leak of framework_fd."
am: 77dc40f2fa

* commit '77dc40f2fa3126871f64bc9e13a374d29bc3440f':
  adb: fix leak of framework_fd.
2016-02-25 18:46:32 +00:00
Josh Gao 4e5b292299 Merge "adb: bail out if wait_for_device fails in send_shell_command." 2016-02-25 18:43:42 +00:00
Josh Gao 77dc40f2fa Merge "adb: fix leak of framework_fd." 2016-02-25 18:43:34 +00:00
Mattias Nissler 81b546e0ea Merge "Prepare mincrypt tools for move to recovery repo."
am: 511e943855

* commit '511e94385573f891a9dc70d8400b00a7d860c90e':
  Prepare mincrypt tools for move to recovery repo.
2016-02-25 14:59:41 +00:00
Mattias Nissler 511e943855 Merge "Prepare mincrypt tools for move to recovery repo." 2016-02-25 14:55:09 +00:00
Steve Fung b3a48e1863 crash_reporter: Fix product_id in kernel crash reports
Move the bdk_version, product_id, and product_version metadata
population into the base crash_collector class so that all
colletors correctly report those fields in crash reports.

BUG=27344416
TEST=crash_reporter_tests passes.

Change-Id: I050053055f197d01661a1442e3cdcccc53c1c8fe
2016-02-25 03:37:33 -08:00
Dimitry Ivanov 8c64eeaefe Merge "Add PreloadPublicNativeLibraries function"
am: 0f8753c6f0

* commit '0f8753c6f0b6acb8cb417e3a310b050d8825df67':
  Add PreloadPublicNativeLibraries function
2016-02-25 02:10:36 +00:00
Josh Gao 9f48611554 adb: fix leak of framework_fd.
Move the fdevent for the framework authentication connection out of
atransport into its own static variable in adb_auth_client, since its
lifetime is completely unrelated to that of the USB connection.

Bug: http://b/27297963
Change-Id: Ie6180d0b59d133120c5755e239e76ab33ed3cc1d
2016-02-24 17:56:12 -08:00
Dimitry Ivanov 0f8753c6f0 Merge "Add PreloadPublicNativeLibraries function" 2016-02-25 01:05:56 +00:00
Dimitry Ivanov 6f80022908 Add PreloadPublicNativeLibraries function
Shift responsibility of preloading native libraries to the user
of the library. This lets applications that do not use jni but
depend on libnative_loader.so to avoid unnecessary preloads of
public libraries which could be expensive.

Bug: http://b/27245894
Change-Id: I12a8100de5da639c068769bca21ecebff2b2d538
(cherry picked from commit 426799d770)
2016-02-24 16:45:26 -08:00
Josh Gao f56c39194f adb: bail out if wait_for_device fails in send_shell_command.
Bug: http://b/27166186
Change-Id: Ib7e9d7e6b909d67a3af94c3517a6a0b54cf17db7
2016-02-24 15:22:14 -08:00
Jorge Lucangeli Obes c41b28b8bc Merge "adbd: Remove explicit capability bounding set code."
am: d458730b64

* commit 'd458730b649a044268807d1458867e3c1d0577b2':
  adbd: Remove explicit capability bounding set code.
2016-02-24 22:21:07 +00:00
Jorge Lucangeli Obes e2d720a61f Merge "Add more first-party Brillo system users."
am: 21dd6feb1c

* commit '21dd6feb1cca28192d9ad3a19fb126657970fc78':
  Add more first-party Brillo system users.
2016-02-24 22:20:44 +00:00
Jorge Lucangeli Obes d458730b64 Merge "adbd: Remove explicit capability bounding set code." 2016-02-24 22:13:09 +00:00
Jorge Lucangeli Obes 21dd6feb1c Merge "Add more first-party Brillo system users." 2016-02-24 22:12:46 +00:00
James Hawkins 3733d82596 Merge "bootstat: Record the time since factory reset on init."
am: 4a630ee0d3

* commit '4a630ee0d3cc436fe36433f048190b297c513c4f':
  bootstat: Record the time since factory reset on init.
2016-02-24 21:39:52 +00:00
Jorge Lucangeli Obes 1c13c3d388 Add more first-party Brillo system users.
Brillo is converging on a set of mandatory system services to be
included in all Brillo builds. We'd like these services to run as
separate users just like other native Android/Brillo system services.

Add users for these services:
-Firewalld: Brillo has more granular firewall requirements (think e.g.
  Brillo-powered router.) Firewalld exposes a (currently) D-Bus/
  (soon to be) Binder API to broker access to IPTables rules.
-Trunksd: Some Brillo product configs will require TPMs. Trunksd
  manages TPMs in Chrome OS and Brillo.

Bug: 27299198

Change-Id: Ibe3303acdd9398ea52da0a37dbef73e5c5a948f7
2016-02-24 13:38:01 -08:00
Jorge Lucangeli Obes 1771e93797 Resolve merge conflicts of c5972cda6c to stage-aosp-master.
Change-Id: I3ab7810e047d128a4ac088eda857c3842f2d6de8
2016-02-24 13:07:32 -08:00
James Hawkins 4a630ee0d3 Merge "bootstat: Record the time since factory reset on init." 2016-02-24 20:48:00 +00:00
Jorge Lucangeli Obes c5972cda6c Merge "Sync internal<->AOSP user list." 2016-02-24 19:07:04 +00:00
James Hawkins 53684ea625 bootstat: Record the time since factory reset on init.
Bug: 25448351
Change-Id: I71905a598e74f41c18a96d469c7a6ddd5a2e07fb
2016-02-24 11:01:03 -08:00
Mark Salyzyn 5c77ad55d0 logd: sock_alloc_send_pskb starves pruning
Allow socket send syscall to terminate after 32 seconds if reader
stalled because of memory pressure allocating new network buffers

Add a gTest to catch regressions, add security buffer to log_dump

Bug: 27242723
Change-Id: Idaa6699d9d284e7f5f723ae0e76b3d6aa3371489
2016-02-24 10:15:32 -08:00
Mark Salyzyn 2ad0bd0a9b logd: Allow (some) headers to be individually importable
LogReader.h needs to be individually importable.

Fix a few others, drop includes of local includes, let them be
included in source instead and allow headers to be included
alphabetically. Was not a complete audit since goal was to
separate LogReader.h out from the pack.

Bug: 27242723
Change-Id: Ic7759ef90995e5bd285810706af33550c73cf5b5
2016-02-24 10:15:22 -08:00
Mattias Nissler 3436bb4bd8 Prepare mincrypt tools for move to recovery repo.
This adds a conditional build guard to enable a smooth move of the
dumpkey tool to the bootable/recovery project without breaking the
build during the transition period.

BUG:27326256
Change-Id: Ia23b31bb559a668273b5c0548b7bd1797049a224
2016-02-24 16:06:32 +01:00
Chien-Yu Chen 0836c9e386 Sync internal<->AOSP user list.
Bug: 27299198

Cherry-picked from:

Restart cameraserver

Bug: 24511454
Change-Id: Ia27f4ef0eb71f891c789f637a21b04afe0b1c4e9
2016-02-23 15:56:55 -08:00
Dan Willemsen 1fa1791a04 Merge "Remove duplicate fdevent.cpp entry"
am: 978cda5cc6

* commit '978cda5cc64bd0c0fe1915074bbf6237b2214faa':
  Remove duplicate fdevent.cpp entry
2016-02-23 23:42:51 +00:00
Dan Willemsen 978cda5cc6 Merge "Remove duplicate fdevent.cpp entry" 2016-02-23 23:36:10 +00:00
Dan Willemsen 582c8fe1d4 Remove duplicate fdevent.cpp entry
Fixes the following warnings:

build/core/binary.mk:894: warning: overriding commands for target
`out/target/product/bullhead/obj/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
build/core/binary.mk:894: warning: ignoring old commands for target
`out/target/product/bullhead/obj/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
build/core/binary.mk:894: warning: overriding commands for target
`out/target/product/bullhead/obj_arm/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
build/core/binary.mk:894: warning: ignoring old commands for target
`out/target/product/bullhead/obj_arm/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'

Change-Id: Id4b13574e568284cefbc3a763d40843e73ddbd3d
2016-02-23 14:28:20 -08:00
Bernhard Rosenkränzer c434cf82d5 Allow building with Python 3.x
Allow the scripts to run with both python 2.x and 3.x

Change-Id: I911118bcf370d09bdb2fb46afa21af64257f1ffb
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2016-02-23 21:39:35 +00:00
Jorge Lucangeli Obes 4d186ad964 adbd: Remove explicit capability bounding set code.
Minijail supports dropping capabilities from the bounding set.
Use that code instead.

This cleans up one small loose end in the work started with
https://android-review.googlesource.com/#/c/187775/

Final diff: fewer lines, more unit-tested code.
"""
$ git diff --stat 52cf4fa6aa3e8d13f61b1 adb/daemon/main.cpp
 adb/daemon/main.cpp | 56
 1 file changed, 27 insertions(+), 29 deletions(-)
"""

Bug: 27314096
Change-Id: I238975920b85fae376522eb26f5ad6d9fee0762a
2016-02-23 13:39:11 -08:00
Elliott Hughes 2d0899a3b4 Merge "Clean up CLOEXEC in qtaguid."
am: 72d6269b6e

* commit '72d6269b6efda3e43a119de048b87758ff970184':
  Clean up CLOEXEC in qtaguid.
2016-02-23 18:46:44 +00:00
Elliott Hughes f5a2f6e963 Merge "Clean up CLOEXEC in SocketListener."
am: ed83cfba68

* commit 'ed83cfba68d51e5de3a50a1ca5d471fd7244a17a':
  Clean up CLOEXEC in SocketListener.
2016-02-23 18:46:31 +00:00
Elliott Hughes dbab798695 Merge "Clean up CLOEXEC in debuggerd."
am: f405d245eb

* commit 'f405d245eb1288c8085cfdeaa3e02b4af707c4f1':
  Clean up CLOEXEC in debuggerd.
2016-02-23 18:46:21 +00:00
Elliott Hughes 72d6269b6e Merge "Clean up CLOEXEC in qtaguid." 2016-02-23 18:41:47 +00:00
Elliott Hughes ed83cfba68 Merge "Clean up CLOEXEC in SocketListener." 2016-02-23 18:41:46 +00:00
Elliott Hughes f405d245eb Merge "Clean up CLOEXEC in debuggerd." 2016-02-23 18:40:56 +00:00
Ruchi Kandoi 78ed1935e1 Merge "healthd: Remove warning by clang compiler."
am: 08c8b53800

* commit '08c8b53800fbfec28a8ea94f4443e9a3812b1ab3':
  healthd: Remove warning by clang compiler.
2016-02-23 17:36:48 +00:00