Commit Graph

3130 Commits

Author SHA1 Message Date
Dima Zavin 75e488841d am 3c58933a: am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd
* commit '3c58933aa785ab26f77284f6a1a4e93d2ebfcf04':
  rootdir: init.rc: write default oom_adj before starting ueventd
2011-11-07 17:33:49 +00:00
Dima Zavin 3c58933aa7 am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd
* commit '4a2539085062a715b0d345eb50ea48738423c909':
  rootdir: init.rc: write default oom_adj before starting ueventd
2011-11-07 17:32:02 +00:00
Jeff Brown 8e4e894acf Merge "Improve stack unwinder robustness." 2011-11-04 20:06:26 -07:00
Dima Zavin 4a25390850 rootdir: init.rc: write default oom_adj before starting ueventd
Otherwise, ueventd's oom_adj value would have been 0 and it could
easily get killed early during low memory events

Change-Id: I1adbd18c37215b26ae77e70f7b8dbd1e143fc2d4
Signed-off-by: Dima Zavin <dima@android.com>
2011-11-04 12:45:56 -07:00
The Android Open Source Project fe7e9d77c4 Reconcile with ics-mr1-release
Change-Id: I27a75e893fe4a1e17c7e0b7dd0e96116f3437762
2011-11-04 08:31:46 -07:00
The Android Open Source Project 0f80eb24e5 am 99436ca8: am 6182d031: Reconcile with ics-factoryrom-2-release
* commit '99436ca879c7ec32fda845559fcb038001619dae':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
2011-11-04 14:59:38 +00:00
The Android Open Source Project 99436ca879 am 6182d031: Reconcile with ics-factoryrom-2-release
* commit '6182d031d7a1968c2edc8862bb5a9bc5bc8922e9':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
2011-11-04 14:58:27 +00:00
The Android Open Source Project 6182d031d7 Reconcile with ics-factoryrom-2-release
Change-Id: If9c35eae1d56a9fc9017c0ae6626466579a4ac96
2011-11-04 07:57:25 -07:00
Jeff Brown f0c5872637 Improve stack unwinder robustness.
Keep track of whether memory maps are readable.  Use the information
in try_get_word to try to avoid accidentally dereferencing an invalid
pointer within the current process.  (Note that I haven't ever
seen that happen during normal unwinding, but it pays to be
a little more careful.)

Refactored try_get_word a little to make it easier to pass it the
needed state for validation checks by way of a little memory_t struct.

Improved how the memory map for the current process is cached.  This is
important because we need up to date information about readable maps.
Use a 5 second cache expiration.

Improved the PC -> LR fallback logic in the unwinder so we can
eke out an extra frame sometimes.

Fixed a bug reading ELF program headers.  The phnum & phentsize
fields are half-words.  We were incorrectly interpreting
phnum as a whole word.

Used android_atomic_* operations carefully in the unwinder
to prevent possible memory races between the dumper and the dumpee.
This was highly unlikely (or even impossible due to the presence
of other barriers along the way) but the code is clearer now about
its invariants.

Fixed a bug in debuggerd where the pid was being passed to have
its stack dump taken instead of the tid, resulting in short
stacks because ptrace couldn't read the data if pid != tid.
Did a full sweep to ensure that we use pid / tid correctly everywhere.

Ported old code from debuggerd to rewind the program counter back
one instruction so that it points to the branch instruction itself
instead of the return address.

Change-Id: Icc4eb08320052975a4ae7f0f5f0ac9308a2d33d7
2011-11-04 01:11:04 -07:00
The Android Automerger b1966c5e76 Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
This reverts commit 4f7c0843bb, reversing
changes made to 6fb3df8d46.
2011-11-02 21:04:38 -07:00
The Android Automerger 08ffd07a88 Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
This reverts commit 6fb3df8d46, reversing
changes made to d4f29767c8.
2011-11-02 21:04:22 -07:00
The Android Automerger 86eeea5ce8 Revert "Merge "Remove log spam" into ics-mr0"
This reverts commit d4f29767c8, reversing
changes made to 604f52e313.
2011-11-02 21:04:09 -07:00
The Android Automerger 23420745e2 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 20:53:30 -07:00
The Android Open Source Project fe6c59489c am 03d7ffc1: am 0e4d9eb8: Reconcile with ics-factoryrom-2-release
* commit '03d7ffc1c8f84773af94abc6fbeb1f631e993c17':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
2011-11-02 17:58:59 +00:00
The Android Open Source Project 03d7ffc1c8 am 0e4d9eb8: Reconcile with ics-factoryrom-2-release
* commit '0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
2011-11-02 17:56:13 +00:00
The Android Open Source Project 0e4d9eb8f8 Reconcile with ics-factoryrom-2-release
Change-Id: Ibfe7c2c1d309f7caae0be71ae631b69830f4e624
2011-11-02 10:53:31 -07:00
Dmitry Shmidt 06f3a51d8b am 03829345: am e7184667: am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0
* commit '0382934575ad1b915a8edba83292d2e9eccb8049':
  libnl_2: Fix memory leaks
2011-11-02 17:42:42 +00:00
Dima Zavin 57489d4037 am 1d6a0a2e: am 3e3d0780: am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0
* commit '1d6a0a2ee637eeea1d8fde63a77299ac891cd3a8':
  charger: make the almost-full frame only show when it's current level
2011-11-02 17:31:46 +00:00
Irfan Sheriff 60eec53f3a am 08db16ac: am a7997f4a: am d4f29767: Merge "Remove log spam" into ics-mr0
* commit '08db16ac10dcbe064810c7dcff67f100ac787160':
  Remove log spam
2011-11-02 17:30:43 +00:00
The Android Automerger 6641b39923 Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
This reverts commit 4f7c0843bb, reversing
changes made to 6fb3df8d46.
2011-11-02 10:18:15 -07:00
The Android Automerger fa792b19cc Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
This reverts commit 6fb3df8d46, reversing
changes made to d4f29767c8.
2011-11-02 10:18:01 -07:00
The Android Automerger 77aa295272 Revert "Merge "Remove log spam" into ics-mr0"
This reverts commit d4f29767c8, reversing
changes made to 604f52e313.
2011-11-02 10:17:46 -07:00
The Android Automerger df241e54ae merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 09:48:57 -07:00
Nick Kralevich 2e7c833279 Set kptr_restrict to 2.
To make writing kernel exploits harder, set /proc/sys/kernel/kptr_restrict
to "2". This prohibits users from accessing kernel symbols via /proc/kallsyms

Bug: 5555668
Change-Id: Ib31cb6fcb4d212a0b570ce9e73ae31f721ed801b
2011-11-02 09:24:27 -07:00
The Android Automerger 3d695243b2 merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 06:47:10 -07:00
The Android Automerger 6d9f02302d Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
This reverts commit 4f7c0843bb, reversing
changes made to 6fb3df8d46.
2011-11-02 04:41:24 -07:00
Dmitry Shmidt 0382934575 am e7184667: am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0
* commit 'e71846671e6dbb2ece3142be92b33ff85f713997':
  libnl_2: Fix memory leaks
2011-11-02 00:14:58 +00:00
Dmitry Shmidt e71846671e am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0
* commit '4f7c0843bbaa9cb4ec3a7890461cebbee689530a':
  libnl_2: Fix memory leaks
2011-11-02 00:13:04 +00:00
Dmitry Shmidt 4f7c0843bb Merge "libnl_2: Fix memory leaks" into ics-mr0 2011-11-01 17:12:02 -07:00
Dmitry Shmidt d99fe5ec96 libnl_2: Fix memory leaks
BUG: b/5532633

Change-Id: I271168764e26dc465d2442f5015338a3e9a479b8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-11-01 15:56:22 -07:00
Dima Zavin 1d6a0a2ee6 am 3e3d0780: am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0
* commit '3e3d0780fcc8da7f9917b3f9d05e16ffc08d4b6f':
  charger: make the almost-full frame only show when it's current level
2011-11-01 22:32:41 +00:00
Dima Zavin 3e3d0780fc am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0
* commit '6fb3df8d468a105b49c1cdbbdcb061dc8de022a4':
  charger: make the almost-full frame only show when it's current level
2011-11-01 22:30:25 +00:00
Dima Zavin 6fb3df8d46 Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0 2011-11-01 15:28:42 -07:00
Mathias Agopian f4360c133e am 640cad52: am 04a87590: restart surfaceflinger and drmserver when servicemanager dies
* commit '640cad52ca94dce70b4c9c3424dee18fbe87c84d':
  restart surfaceflinger and drmserver when servicemanager dies
2011-11-01 21:58:59 +00:00
Irfan Sheriff 08db16ac10 am a7997f4a: am d4f29767: Merge "Remove log spam" into ics-mr0
* commit 'a7997f4ae27b5c07eb7dbfd2ac0e99472a950855':
  Remove log spam
2011-11-01 20:21:59 +00:00
Irfan Sheriff a7997f4ae2 am d4f29767: Merge "Remove log spam" into ics-mr0
* commit 'd4f29767c8cd5a0d8b52b77bed117ca3746af8f3':
  Remove log spam
2011-11-01 20:19:46 +00:00
Irfan Sheriff d4f29767c8 Merge "Remove log spam" into ics-mr0 2011-11-01 13:17:53 -07:00
The Android Automerger 332baee868 merge in ics-mr1-release history after reset to ics-mr1 2011-11-01 06:46:40 -07:00
Dima Zavin 9ec3f3e2e4 charger: make the almost-full frame only show when it's current level
Change-Id: Id53de101dd3c211d376abfd748e7646e28291749
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-31 17:04:33 -07:00
Mathias Agopian 640cad52ca am 04a87590: restart surfaceflinger and drmserver when servicemanager dies
* commit '04a875902ece07769101a5202e3af554af31a911':
  restart surfaceflinger and drmserver when servicemanager dies
2011-10-31 21:33:19 +00:00
Mathias Agopian 04a875902e restart surfaceflinger and drmserver when servicemanager dies
Bug: 5450389

Change-Id: Ib4e73836721e25e2a88185167b030ea75e0d74e3
2011-10-31 14:27:47 -07:00
The Android Open Source Project 06286288ef Reconcile with ics-mr1-release
Change-Id: Ibdbd1329aaad7a60ae68c43dacade214fd7e1181
2011-10-31 13:19:40 -07:00
The Android Automerger 17233eea85 merge in ics-mr1-release history after reset to ics-mr1 2011-10-30 06:48:38 -07:00
Irfan Sheriff 477df68854 Remove log spam
Bug: 5533986
Change-Id: I3d8108e2f65ce6513ac8b2d14541eaa5e4fc5da1
2011-10-28 23:57:32 -07:00
Jeff Sharkey 42b54d83df am 1b3c4299: am 70212a40: Merge "Gracefully handle truncated log messages." into ics-mr1
* commit '1b3c42992abbd97afb51af4bd8754646b8ebf689':
  Gracefully handle truncated log messages.
2011-10-28 22:27:24 +00:00
Jeff Sharkey 1b3c42992a am 70212a40: Merge "Gracefully handle truncated log messages." into ics-mr1
* commit '70212a404a46c6a2d4830e721156c3fafbfb1a3a':
  Gracefully handle truncated log messages.
2011-10-28 18:58:26 +00:00
Jeff Sharkey 70212a404a Merge "Gracefully handle truncated log messages." into ics-mr1 2011-10-28 11:56:17 -07:00
Jean-Baptiste Queru 1941c91389 am 4ef824e9: am 71619f13: am 604f52e3: Reconcile with AOSP master
* commit '4ef824e9481625270aa065cc4d0625e8c8d9e0df':
2011-10-28 15:43:04 +00:00
Jean-Baptiste Queru 4ef824e948 am 71619f13: am 604f52e3: Reconcile with AOSP master
* commit '71619f13956e44c1b8cb18ddb29bd2522020a7f8':
2011-10-28 15:41:59 +00:00
Jean-Baptiste Queru 71619f1395 am 604f52e3: Reconcile with AOSP master
* commit '604f52e31357a774ad49290e323976b1db5b9f38':
  Fix build
2011-10-28 15:39:50 +00:00