Colin Cross
cf8d1c22f7
Add libprocessgroup
...
libprocessgroup will allow Zygote to place processes
in a cgroup, and then kill the process and all forked processes
later. lmkd will also kill all forked processes.
Bug: 15313911
Change-Id: I20404d0dbe448f1c475d2f4c61cccca462f9e544
2014-07-09 17:24:39 -07:00
Colin Cross
038975a5c8
Merge "lmkd: pass uid from ActivityManager to lmkd"
2014-07-09 21:34:29 +00:00
Nick Kralevich
ee0388e768
am f89ddf76: am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"
...
* commit 'f89ddf76f9e3c10af9002cdb0d9b8eadcd59bf15':
restorecon_recursive /cache
2014-07-09 20:03:29 +00:00
Nick Kralevich
f89ddf76f9
am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"
...
* commit 'd05245a4b10044670ed8456c5c869490fd90583f':
restorecon_recursive /cache
2014-07-09 20:01:02 +00:00
Nick Kralevich
d05245a4b1
am c87237f5: Merge "restorecon_recursive /cache"
...
* commit 'c87237f5af41905a21a348a164a1ef3c31ace6c6':
restorecon_recursive /cache
2014-07-09 19:58:55 +00:00
Colin Cross
fbb78c6fee
lmkd: pass uid from ActivityManager to lmkd
...
lmkd will use the uid to find processgroups and kill forked processes.
Bug: 15313911
Change-Id: I3f7bb003ccf15650cae6ebc2c042ddeb4cc796fc
2014-07-09 11:30:52 -07:00
Daniel Rosenberg
33e7b13167
Made formatting for newfs_msdos.c more uniform
...
Change-Id: I3d14350c70c05a7e2f713d0065524d78f9a413c6
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-09 17:33:39 +00:00
Elliott Hughes
6ebab06dc4
am f043f061: am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."
...
* commit 'f043f061295a787aca42186fe9ab87c24d393b92':
Fix sdcard's FUSE_FSYNCDIR handling.
2014-07-09 12:16:46 +00:00
Elliott Hughes
40372e5b4e
am 94645665: am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr."
...
* commit '9464566580559b7353e6e2c898da79ffbbf993aa':
Make sdcard log to the log rather than stderr.
2014-07-09 12:16:41 +00:00
Elliott Hughes
f043f06129
am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."
...
* commit '060b6ecb663a903d4a2c0496fadcfbc4148bc0d6':
Fix sdcard's FUSE_FSYNCDIR handling.
2014-07-08 22:29:06 +00:00
Elliott Hughes
060b6ecb66
am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."
...
* commit '6e141aea189769a428a7da6c2206df6d0ed2c69d':
Fix sdcard's FUSE_FSYNCDIR handling.
2014-07-08 22:25:12 +00:00
Elliott Hughes
9464566580
am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr."
...
* commit 'f8acdcbe1103637c9d339bd9c954fb36e6785a74':
Make sdcard log to the log rather than stderr.
2014-07-08 21:39:16 +00:00
Elliott Hughes
f8acdcbe11
am 75b7171f: Merge "Make sdcard log to the log rather than stderr."
...
* commit '75b7171fcb1a8f898ba533011ccb813792932e4c':
Make sdcard log to the log rather than stderr.
2014-07-08 21:36:33 +00:00
Sreeram Ramachandran
b12e40da25
am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit '0a7b44d55b9e9d038de390457246ec7fd0999cad':
Create a data directory for netd and other network-related files.
2014-07-08 19:14:36 +00:00
Sreeram Ramachandran
0a7b44d55b
am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit 'ab98d2e6a9392e0481dc9cf246b378072d37e95b':
Create a data directory for netd and other network-related files.
2014-07-08 19:11:29 +00:00
Elliott Hughes
f761709a8e
am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit '1829b14cd5887d510d8aedfc1a5b9fa636219525':
Fix LP64 tombstone.cpp build failure.
2014-07-08 18:43:12 +00:00
Elliott Hughes
1829b14cd5
am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit '18e754eebd3d3252e122034c46023df915dd89f6':
Fix LP64 tombstone.cpp build failure.
2014-07-08 18:40:07 +00:00
Elliott Hughes
4f27968f98
am 494bd36d: am dda63545: Merge "Improving maps output."
...
* commit '494bd36d463eeae6398ee340872e6356e498396d':
Improving maps output.
2014-07-08 18:16:10 +00:00
Elliott Hughes
494bd36d46
am dda63545: Merge "Improving maps output."
...
* commit 'dda635455fb085d2f33fd1bdc5140805a055ea05':
Improving maps output.
2014-07-08 18:11:54 +00:00
Nick Kralevich
c87237f5af
Merge "restorecon_recursive /cache"
2014-07-08 18:09:01 +00:00
Nick Kralevich
e1695914d5
restorecon_recursive /cache
...
Make sure all files / directories within /cache are properly
labeled, not just the directory itself.
Addresses the following denial:
type=1400 audit(0.0:26): avc: denied { getattr } for comm="Thread-85" path="/cache/lost+found" dev="mmcblk0p27" ino=11 scontext=u:r:untrusted_app:s0 tcontext=u:object_r:unlabeled:s0 tclass=dir
Change-Id: I5937b30043efeb696ffaa77258b7294d20d1494e
2014-07-09 12:40:13 -07:00
Elliott Hughes
75b7171fcb
Merge "Make sdcard log to the log rather than stderr."
2014-07-08 18:09:01 +00:00
Elliott Hughes
300d564980
Make sdcard log to the log rather than stderr.
...
Change-Id: I9c78941184c5e364055bfac766e1e542d3c23c87
2014-07-08 13:53:26 -07:00
Elliott Hughes
18e754eebd
Merge "Fix LP64 tombstone.cpp build failure."
2014-07-08 17:33:52 +00:00
Elliott Hughes
7e775952e1
Fix LP64 tombstone.cpp build failure.
...
Change-Id: Id071417f56dd883e9d2e38a6f3296cb23a0352fb
2014-07-08 11:35:58 -07:00
dcashman
cddb15b8a9
am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
...
* commit 'b4e74db79c9fda5e63ae49f299df3c0dd80a87f9':
Remove sshd.
2014-07-08 15:13:30 +00:00
dcashman
b4e74db79c
am 3fa71b8e: Merge "Remove sshd."
...
* commit '3fa71b8e83dfc074b7628052ee6fd18d9e2290d0':
Remove sshd.
2014-07-08 15:08:11 +00:00
Nick Kralevich
7367ecbc48
am 06023134: am 8022ce1e: Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"
...
* commit '060231346b9901f28ee8692518bcbc059e5777ca':
ueventd fixup_sys_perms: fixup SELinux labels unconditionally
2014-07-07 19:59:26 +00:00
Nick Kralevich
060231346b
am 8022ce1e: Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"
...
* commit '8022ce1e8742fc21aa0f4653d905c5a404b941dc':
ueventd fixup_sys_perms: fixup SELinux labels unconditionally
2014-07-07 19:54:02 +00:00
Mark Salyzyn
9a357b884f
am badc23f8: am f6ef1f53: Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"
...
* commit 'badc23f847d40b9b076818550bf5ef6272a8010e':
logcat: parse failure for -n <KBsize> and -r <rotate limit>
2014-07-07 18:14:49 +00:00
Mark Salyzyn
badc23f847
am f6ef1f53: Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"
...
* commit 'f6ef1f53ac1b4dd659d23f418042db8dd556b9c2':
logcat: parse failure for -n <KBsize> and -r <rotate limit>
2014-07-07 18:10:49 +00:00
Elliott Hughes
dda635455f
Merge "Improving maps output."
2014-07-07 18:07:41 +00:00
Brigid Smith
8606eaa770
Improving maps output.
...
Maps output now displays fault address location more intelligently. If
the fault is not in a mapped region, it now shows where that address is
with respect to the other maps.
In addition, the size of the map is now printed as part of the output.
Also, crasher now supports an "mmap" option which mmaps/munmaps a region
of memory and then attempts to access it, causing a fault address in
between mapped regions that can be used to test that new part of the
maps output.
Change-Id: Ia5e1926802bdfcbbdb7857e3631ddf395ae0c5b8
2014-07-08 10:53:49 -07:00
dcashman
3fa71b8e83
Merge "Remove sshd."
2014-07-07 18:07:41 +00:00
dcashman
b4cbff47ad
Remove sshd.
...
This may require changes to other code, such as fastbootd, which relies on this
service. sshd is not currently, used, however, so this change will force any
such code to be changed.
Bug: 11594902
Change-Id: I07e52008290dab5825be2ad062cbe730fa7dff71
2014-07-07 23:42:15 +00:00
Nick Kralevich
8022ce1e87
Merge "ueventd fixup_sys_perms: fixup SELinux labels unconditionally"
2014-07-07 18:07:41 +00:00
Nick Kralevich
3b4c0bda07
ueventd fixup_sys_perms: fixup SELinux labels unconditionally
...
Currently, the fixup code in fixup_sys_perms() scans through all
entries in uevent*.rc. If it finds a match, then it performs a fixup.
If there's no match in that file, no fixup is performed.
SELinux file labels are independently stored in /file_contexts,
with no relationship to the files in /ueventd.rc. Even when no
entries exist in ueventd.rc, we still want to fixup the SELinux
file label in /sys when a uevent message occurs.
Change-Id: I0ccb5395ec0be9282095b844a5022e8c0d8903ac
2014-07-07 11:14:59 -07:00
Mark Salyzyn
f6ef1f53ac
Merge "logcat: parse failure for -n <KBsize> and -r <rotate limit>"
2014-07-07 17:50:18 +00:00
Mark Salyzyn
0b2dac4f3f
logcat: parse failure for -n <KBsize> and -r <rotate limit>
...
Bug: https://code.google.com/p/android/issues/detail?id=72867
Change-Id: Id0c988543ecfccc5054d15d4195ef578468d50af
2014-07-07 18:04:32 +00:00
Elliott Hughes
6e141aea18
Merge "Fix sdcard's FUSE_FSYNCDIR handling."
2014-07-05 03:01:43 +00:00
Elliott Hughes
f6d6737529
Fix sdcard's FUSE_FSYNCDIR handling.
...
For a file the FUSE fh is a struct handle containing an int fd;
for a directory it's a struct dirhandle containing a DIR*. Fix
handle_fsync to extract the file descriptor appropriately in
both cases.
Bug: 14613980
Change-Id: I45515cff6638e27a99b849e6fc639d355dbb4d27
2014-07-08 14:38:26 -07:00
Nick Kralevich
e73fc3ab65
am 039b9cef: am 5529de0f: Merge "logd_write: set SOCK_CLOEXEC on socket"
...
* commit '039b9cef807b278a49815bcfe10389fe6efa5c82':
logd_write: set SOCK_CLOEXEC on socket
2014-07-03 16:05:18 +00:00
Nick Kralevich
039b9cef80
am 5529de0f: Merge "logd_write: set SOCK_CLOEXEC on socket"
...
* commit '5529de0fa3f41edb72737b00be13ef77b33d0a2b':
logd_write: set SOCK_CLOEXEC on socket
2014-07-03 16:00:25 +00:00
Nick Kralevich
5529de0fa3
Merge "logd_write: set SOCK_CLOEXEC on socket"
2014-07-03 01:32:01 +00:00
Nick Kralevich
118d1b3930
logd_write: set SOCK_CLOEXEC on socket
...
Socket file descriptors remain open across exec unless
SOCK_CLOEXEC is set. Enable this option, to avoid leaking
file descriptors.
See https://android-review.googlesource.com/53736 for a similar
problem with the old logging code.
Change-Id: I9e045d2291ae6680044ab86604f3ff2c55b5eaed
2014-07-02 22:30:39 -07:00
Colin Cross
b18d44e458
am ab7e5752: am 09117c70: Merge "ueventd: allow matching symlink names when setting permissions"
...
* commit 'ab7e5752b0f02d8a5b6d70b94c41eed9f4068005':
ueventd: allow matching symlink names when setting permissions
2014-07-02 21:08:53 +00:00
Colin Cross
ab7e5752b0
am 09117c70: Merge "ueventd: allow matching symlink names when setting permissions"
...
* commit '09117c70f1cc0de77c62d6f7f5bee04e3fc7ef83':
ueventd: allow matching symlink names when setting permissions
2014-07-02 21:03:42 +00:00
Colin Cross
09117c70f1
Merge "ueventd: allow matching symlink names when setting permissions"
2014-07-02 20:52:43 +00:00
Colin Cross
43d537e0de
ueventd: allow matching symlink names when setting permissions
...
Change-Id: I5f6cc2a25f1236fbe2c7193b65363b7883b9ba2e
2014-07-02 13:56:55 -07:00
Sreeram Ramachandran
ab98d2e6a9
Merge "Create a data directory for netd and other network-related files."
2014-07-02 20:49:53 +00:00