Commit Graph

5315 Commits

Author SHA1 Message Date
Nick Kralevich e657e0c2a4 am 1a2bdd6f: Merge "liblog: fix fd leakage"
* commit '1a2bdd6fbef8119e05be703658ef7fa2017ecf6e':
  liblog: fix fd leakage
2013-03-15 10:06:45 -07:00
Nick Kralevich 1a2bdd6fbe Merge "liblog: fix fd leakage" 2013-03-15 16:56:40 +00:00
Nick Kralevich a170322083 liblog: fix fd leakage
File descriptors remain open across an exec unless FD_CLOEXEC is
set.  Add O_CLOEXEC to the open() call to prevent file descriptor
leakage.

In particular, the following program will eventually run out of
file descriptors:

int main(int argc, char **argv) {
  printf("===== entering main =====\n");
  ALOGW("entering main");
  system("ls -l /proc/self/fd/");

  execv(argv[0], argv);
  printf("exec failed\n");
  return -1;
}

Change-Id: I5be43ab3b9f82a05f242b1f586454c50568af388
2013-03-15 09:48:32 -07:00
Rom Lemarchand c113311e6c am 74a7b91c: liblogwrap: lock android_fork_execvp
* commit '74a7b91cbe29d3a9e6500fb90aae6d9a858dc1f7':
  liblogwrap: lock android_fork_execvp
2013-03-15 05:17:49 +00:00
Rom Lemarchand 74a7b91cbe liblogwrap: lock android_fork_execvp
Add a lock around android_fork_execvp to ensure no two threads can
execute it at the same time.

This is to help with http://b/8333626

Change-Id: I75d087a74b58f5b8e878675b301200f54d976fb2
2013-03-14 21:31:07 -07:00
Colin Cross 89f08da256 am 39b7fdea: am c8c95f86: am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ prefix"
* commit '39b7fdea315bf60c5d1e9ae1ddd4b81e2cf83b23':
  ueventd: allow platform devices to have just a /devices/ prefix
2013-03-15 01:33:21 +00:00
Colin Cross 39b7fdea31 am c8c95f86: am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ prefix"
* commit 'c8c95f86712989003ddd9c55261942d0d83ca9f4':
  ueventd: allow platform devices to have just a /devices/ prefix
2013-03-14 18:30:59 -07:00
Colin Cross c8c95f8671 am 80dac350: Merge "ueventd: allow platform devices to have just a /devices/ prefix"
* commit '80dac35023bb7860b7382ca995e19710bd894e7e':
  ueventd: allow platform devices to have just a /devices/ prefix
2013-03-14 18:29:19 -07:00
Colin Cross 80dac35023 Merge "ueventd: allow platform devices to have just a /devices/ prefix" 2013-03-15 01:16:17 +00:00
Dima Zavin f395c9237d ueventd: allow platform devices to have just a /devices/ prefix
When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-14 18:14:32 -07:00
Elliott Hughes e998ba6150 am e05093b9: am 3e77b752: am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"
* commit 'e05093b924652acb76b4527a3c32807cfa68118c':
  Unwinding implementation via eh_frame sections for x86
2013-03-15 00:27:46 +00:00
Elliott Hughes e05093b924 am 3e77b752: am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"
* commit '3e77b7521ba96fd1ff6fed0e019aff5f46a31428':
  Unwinding implementation via eh_frame sections for x86
2013-03-14 17:25:04 -07:00
Elliott Hughes 3e77b7521b am 0b535558: Merge "Unwinding implementation via eh_frame sections for x86"
* commit '0b5355589429cabac0e16f36c6e6541f8aafba08':
  Unwinding implementation via eh_frame sections for x86
2013-03-14 17:23:35 -07:00
Elliott Hughes 0b53555894 Merge "Unwinding implementation via eh_frame sections for x86" 2013-03-14 23:32:54 +00:00
Nick Kralevich 5cd723fa93 am eb6dd010: am 9573a175: am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""
* commit 'eb6dd010b56bbca76f345967d55d0faab6c5fbf3':
  Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
2013-03-14 23:19:35 +00:00
Nick Kralevich eb6dd010b5 am 9573a175: am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""
* commit '9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4':
  Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
2013-03-14 16:16:40 -07:00
Nick Kralevich 9573a1755c am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""
* commit 'dbf4937b5a1ef4ceed49e13527f50514c510ebd4':
  Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
2013-03-14 16:14:06 -07:00
Jeff Sharkey 64b31d3698 am fb4f7ace: Add symlink to bugreport storage location.
* commit 'fb4f7acefb31a51679cec194562c7aeb3922f728':
  Add symlink to bugreport storage location.
2013-03-14 23:09:34 +00:00
Nick Kralevich dbf4937b5a Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."" 2013-03-14 22:28:24 +00:00
Nick Kralevich 76ba83cce2 Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
This logic has been moved to platform/frameworks/base commit
8a0a929422682ba3eb6a205dc6c0638e68b909de and is no longer needed
here.

This reverts commit 01b1dee0ab.
2013-03-14 15:23:30 -07:00
Jeff Sharkey fb4f7acefb Add symlink to bugreport storage location.
Change-Id: I16f024c24767cfa1f5800d568d39fb098a408127
2013-03-14 14:27:38 -07:00
Pavel Chupin af2cb3667b Unwinding implementation via eh_frame sections for x86
Backtracing through eh_frame section is more effective allowing to reuse
ebp register for other purposes within routine. GCC with turned on
optimizations (-O1 and above) implicitly defines -fomit-frame-pointer
anyway. eh_frame sections are generated by default with GCC on any
optimization level.

This change implements remote unwinding (separate process unwinding).
Local unwinding is already implemented through _Unwind_Backtrace call
which is implemented in libgcc.

Change-Id: I1aea1ecd19c21710f9cf5f05dc272fc51b67b7aa
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-03-14 19:11:44 +04:00
The Android Automerger 4e74882a80 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-13 05:56:15 -07:00
Sam Lin 461ead42fe am 91535cff: Merge "Add vendor IDs to adb" into jb-mr2-dev
* commit '91535cff09af5b0181bffe64e97dcae9d24ba219':
  Add vendor IDs to adb
2013-03-13 03:03:09 +00:00
Sam Lin 91535cff09 Merge "Add vendor IDs to adb" into jb-mr2-dev 2013-03-13 03:01:45 +00:00
Colin Cross 8f17ea6b78 am d4b360a2: am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"
* commit 'd4b360a2e89d7d7f2dd7ff5f7dca6a2578c532cf':
  mkbootimg: support 8192/16384 pagesizes
2013-03-12 23:55:51 +00:00
Colin Cross d4b360a2e8 am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"
* commit '1d77e6e4e3d304f86d0cfa2cfcf5266192420cae':
  mkbootimg: support 8192/16384 pagesizes
2013-03-12 16:53:24 -07:00
Colin Cross 1d77e6e4e3 am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes"
* commit '3960ec226d07c7327ac6967a2977c521fd4884b6':
  mkbootimg: support 8192/16384 pagesizes
2013-03-12 16:50:40 -07:00
Rom Lemarchand 914b65fcb9 am 451dd85f: liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY
* commit '451dd85fb204b5015c461eabc78722abd1c4252a':
  liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY
2013-03-12 23:12:16 +00:00
Colin Cross 3960ec226d Merge "mkbootimg: support 8192/16384 pagesizes" 2013-03-12 21:47:47 +00:00
Rom Lemarchand 451dd85fb2 liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY
Makes the code slightly more readable and avoids boilerplate.

Change-Id: I023d9a1e1de729deaec97c62a5ca7983b6918f94
2013-03-12 08:55:38 -07:00
The Android Open Source Project 81ab2eb2c8 Reconcile with jb-mr2-release - do not merge
Change-Id: If556a8aade619e94ef8cf3bfa2f65d4efa2c4550
2013-03-12 07:15:17 -07:00
The Android Automerger eba780c923 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-12 05:56:38 -07:00
Sam Lin 644b6afdac Add vendor IDs to adb
Adding vendor IDs to adb for device partners:
  AnyDATA, Harris & Oppo

Change-Id: Ib8c5196c53599bd6eb077871cd95ccac935c42e7
2013-03-12 20:19:53 +08:00
Jean-Baptiste Queru 758045fad5 am 7398664d: am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '7398664de30cf953b791ab5aeeb37dfd57410698':
2013-03-11 20:49:27 +00:00
Jean-Baptiste Queru 7398664de3 am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c8b3fee48ca53150b38d84c70e2679f91d293efb':
2013-03-11 13:44:39 -07:00
Jean-Baptiste Queru c8b3fee48c am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f9094401491ecee8e574b294a22e850bfc2b5043':
2013-03-11 13:13:49 -07:00
Jean-Baptiste Queru f909440149 am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '75f29709af6d053168402dd12cdf8b0a58b0c35e':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
2013-03-11 13:00:54 -07:00
Jean-Baptiste Queru 75f29709af am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '09b43645514669b3ff8181b0a111bc14576e3699':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
2013-03-11 12:47:27 -07:00
Jean-Baptiste Queru 09b4364551 am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '92b2cd23f708c9aeed146e995807dce080b57d1a':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
2013-03-11 12:28:11 -07:00
Jean-Baptiste Queru 92b2cd23f7 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:23:26 -07:00
Dima Zavin ac19623f88 am 53a02884: ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE
* commit '53a0288463c3fd88fb7f2cfa37c0e985eb1870f4':
  ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE
2013-03-11 18:15:56 +00:00
Dima Zavin 53a0288463 ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE
When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-11 11:13:17 -07:00
The Android Automerger c1c4ad5609 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-11 05:57:41 -07:00
Ithamar R. Adema 81ce3a79ff mkbootimg: support 8192/16384 pagesizes
By now these sizes are very common, so make sure we support them.

Change-Id: Ib1963fbabc4ec0b4623f2045a3cbeedffbad7ee8
Signed-off-by: Ithamar R. Adema <ithamar@upgrade-android.com>
2013-03-10 14:11:10 +01:00
Young-Ho Cha 7d312208a1 rootdir: goldfish: mount debugfs on boot time
goldfish is ported to linux-3.4 and have capability to run atrace.
But can't run atrace yet because debugfs is not mounted on boot time.

Change-Id: I0ce23bde3b8d1b2a88d4238272123e3ab8cb6970
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
2013-03-10 19:52:14 +09:00
Elliott Hughes f8c710670f am dd0d0e78: am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it"
* commit 'dd0d0e78afb5b809983fe9cebac8cc5d54a284b6':
  Close adb_usb.ini after reading it
2013-03-09 02:33:33 +00:00
Elliott Hughes dd0d0e78af am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it"
* commit '822ea9b3d1cf240b16135e1b5c3bd926c02d17d6':
  Close adb_usb.ini after reading it
2013-03-08 18:32:02 -08:00
Elliott Hughes 822ea9b3d1 am fd5c6b9f: Merge "Close adb_usb.ini after reading it"
* commit 'fd5c6b9f137940ce2d762c85dfdb4d2f1104f2bd':
  Close adb_usb.ini after reading it
2013-03-08 18:30:44 -08:00
Elliott Hughes fd5c6b9f13 Merge "Close adb_usb.ini after reading it" 2013-03-09 01:20:08 +00:00