Commit graph

3242 commits

Author SHA1 Message Date
The Android Automerger
989b2a3a55 merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 06:48:04 -08:00
Robert Greenwalt
06cd7bdc7b am 39b6df11: am c761b54e: Merge "Wimax: wimax related changes for libnetutils" into ics-mr1
* commit '39b6df11dc1875f24b65202f96433fe333fc7bc5':
  Wimax: wimax related changes for libnetutils
2011-11-09 14:34:22 +00:00
Jeff Brown
fb9804bfc2 Print the tombstone path.
When explicitly requesting a dump, show the user the path of
the tombstone file that was generated.

Change-Id: I7fff7dea606872a61687ca087e99f604107b70c4
2011-11-08 20:17:28 -08:00
Nick Kralevich
f9557fba34 Set /proc/sys/kernel/dmesg_restrict to 1
Set dmesg_restrict to 1 to help limit inadvertent information leaks
from the kernel to non-privileged programs.  Root and programs with
CAP_SYSLOG will continue to have access to dmesg output.

See "dmesg_restrict" in Documentation/sysctl/kernel.txt from the
Linux kernel source code.

Bug: 5585365
Change-Id: Iffcf060ea4bd446ab9acf62b8b61d315d4ec4633
2011-11-08 14:46:19 -08:00
Nick Kralevich
1e339a710e Merge "Set kptr_restrict to 2." 2011-11-08 11:39:43 -08:00
Robert Greenwalt
39b6df11dc am c761b54e: Merge "Wimax: wimax related changes for libnetutils" into ics-mr1
* commit 'c761b54ead5ec3f22fafb7ce50dd5c5a1939b03f':
  Wimax: wimax related changes for libnetutils
2011-11-08 18:03:47 +00:00
Robert Greenwalt
c761b54ead Merge "Wimax: wimax related changes for libnetutils" into ics-mr1 2011-11-08 10:02:01 -08:00
The Android Automerger
7938d6d79f merge in ics-mr1-release history after reset to ics-mr1 2011-11-08 06:46:45 -08:00
Ying Wang
67d53e21f5 Merge "Remove unnecessary libraries." 2011-11-07 18:19:12 -08:00
Ying Wang
fcc0580a7e Remove unnecessary libraries.
There is no host library named libcutils.

Change-Id: I3b346b9e1a5556cd0cfc932560d9ce54ae6d38f2
2011-11-07 18:18:27 -08:00
tk.mun
ed21633a5e Wimax: wimax related changes for libnetutils
- Modified dhcp renew code for the new conenctivity changes in ICS

Change-Id: I614dfc62a875b79dbd8b7c46f4d87f366a3c3661
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
2011-11-07 17:15:19 -08:00
Dima Zavin
cd11325af9 am 75e48884: am 3c58933a: am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd
* commit '75e488841d38b67123e5ef0f29186754a52ca5cc':
  rootdir: init.rc: write default oom_adj before starting ueventd
2011-11-07 17:35:45 +00:00
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