summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add Mips memset speedup"Keun-young Park2013-03-292-0/+35
|\
| * Add Mips memset speedupDuane Sand2012-08-292-0/+35
| | | | | | | | Change-Id: I157aa8b500e271c213bf615dd4ceb25b3aedd7c2
* | Merge "run-as: Don't require CAP_DAC_READ_SEARCH"Nick Kralevich2013-03-291-1/+18
|\ \
| * | run-as: Don't require CAP_DAC_READ_SEARCHNick Kralevich2013-03-291-1/+18
|/ / | | | | | | | | | | | | This is a partial AOSP port of Google internal change 080427e4e2b1b72718b660e16b6cf38b3a3c4e3f . Change-Id: I23a7edc808d227caf3862b035dc2ca39639d9d59
* | Merge "run-as: Get seinfo from packages.list and pass to libselinux."Geremy Condra2013-03-283-5/+23
|\ \
| * | run-as: Get seinfo from packages.list and pass to libselinux.Robert Craig2013-03-283-5/+23
|/ / | | | | | | | | | | | | | | | | Change allows the proper seinfo value to be passed to libselinux to switch to the proper app security context before running the shell. Change-Id: I9d7ea47c920b1bc09a19008345ed7fd0aa426e87 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | Merge "Drop /data/system as a policy file location"Geremy Condra2013-03-271-1/+0
|\ \
| * | Drop /data/system as a policy file locationWilliam Roberts2013-03-261-1/+0
|/ / | | | | | | | | | | | | /data/system is no longer used as a policy file location. Use /data/security instead. Change-Id: Ie77be9e25c67c8a2157c7b6c468f3215a49ead52
* | Merge "Fix mode on /data/security."Geremy Condra2013-03-231-1/+1
|\ \
| * | Fix mode on /data/security.Stephen Smalley2013-03-211-1/+1
|/ / | | | | | | | | Change-Id: Id97d06a1c360c7871361db147f76b8a2eaceca42 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Merge "Create a new location for /data policy files"Geremy Condra2013-03-212-0/+4
|\ \
| * | Create a new location for /data policy filesWilliam Roberts2013-03-202-0/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | Adding a new location for policy files under /data, the new location is /data/security. The new location is used before attempting to use any other location. This requires a new directory to be created by the init script and an update to the location of the property_contexts file for property service. Change-Id: I955a722ac3e51fa6c1b97201b8bdef3f601cf09d
* | Merge "debuggerd: Fix minor memory leak"Elliott Hughes2013-03-201-0/+1
|\ \
| * | debuggerd: Fix minor memory leakLiangtao Gao2013-03-201-0/+1
|/ / | | | | | | | | | | | | | | free_ptrace_context(context) doesn't free(context), which leaks the memory allocated to context. Change-Id: Ic199b257aefc9a05ec2d902958efa8a57a601fb1 Signed-off-by: Liangtao Gao <gliangtao@gmail.com>
* | Merge "liblog: fix fd leakage"Nick Kralevich2013-03-151-1/+3
|\ \
| * | liblog: fix fd leakageNick Kralevich2013-03-151-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "ueventd: allow platform devices to have just a /devices/ prefix"Colin Cross2013-03-151-39/+44
|\ \
| * | ueventd: allow platform devices to have just a /devices/ prefixDima Zavin2013-03-141-39/+44
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "Unwinding implementation via eh_frame sections for x86"Elliott Hughes2013-03-145-28/+910
|\ \
| * | Unwinding implementation via eh_frame sections for x86Pavel Chupin2013-03-145-28/+910
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""Nick Kralevich2013-03-141-16/+0
|\ \ \ | |/ / |/| |
| * | Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."Nick Kralevich2013-03-141-16/+0
|/ / | | | | | | | | | | | | | | This logic has been moved to platform/frameworks/base commit 8a0a929422682ba3eb6a205dc6c0638e68b909de and is no longer needed here. This reverts commit 01b1dee0ab7ad649760f9d8a7cead2a3f6d9cf70.
* | Merge "mkbootimg: support 8192/16384 pagesizes"Colin Cross2013-03-121-2/+3
|\ \
| * | mkbootimg: support 8192/16384 pagesizesIthamar R. Adema2013-03-101-2/+3
|/ / | | | | | | | | | | | | 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>
* | Merge "Close adb_usb.ini after reading it"Elliott Hughes2013-03-091-0/+1
|\ \
| * | Close adb_usb.ini after reading itChris Dearman2012-11-161-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Chris Dearman <chris@mips.com> Change-Id: I7d3ee8cbd54af206dac89225c438e6c7322c571f
* | | Merge "Fix issues where the filename is referred to as 'sideload'"Colin Cross2013-03-051-4/+4
|\ \ \
| * | | Fix issues where the filename is referred to as 'sideload'Magnus Eriksson2013-03-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The adb sideload utility referes to the filename as 'sideload' in some places. This patch changes the printouts to display the filename instead. Change-Id: I38ada01a08bed53a8d9697c03f55ce8cee2abe12 Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
* | | | Merge "run-as: set the SELinux security context."Colin Cross2013-03-052-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | run-as: set the SELinux security context.Stephen Smalley2012-11-132-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before invoking the specified command or a shell, set the SELinux security context. Change-Id: Ifc7f91aed9d298290b95d771484b322ed7a4c594 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | Merge "android_filesystem_config.h: change ping and run-as"Nick Kralevich2013-03-012-8/+134
|\ \ \ \
| * | | | android_filesystem_config.h: change ping and run-asNick Kralevich2013-03-012-8/+134
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /system/bin/ping no longer requires CAP_NET_RAW, as we're now using IPPROTO_ICMP. Please see the following for more details: * http://lwn.net/Articles/443051/ * https://android-review.googlesource.com/52090 * https://android-review.googlesource.com/52072 We can now make ping a normal, unprivileged program. /system/bin/run-as only requires CAP_SETUID and CAP_SETGID. Explicitly set the capabilities of this file, and remove the setuid bit. This is equivalent to running the following commands: * chmod 750 /system/bin/run-as * chown root:shell /system/bin/run-as * setcap cap_setgid,cap_setuid+ep /system/bin/run-as Change-Id: I65df858b45e6de4e2190ac9d6d592c06ea9d28cf
* | | | Merge "adb: use correct header file."Nick Kralevich2013-02-281-1/+1
|\ \ \ \
| * | | | adb: use correct header file.Nick Kralevich2013-02-281-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: I7a66ced762dc077247fd7c2714ae8850ffdcaeb9
* | | | Merge "fix mac sdk build."Nick Kralevich2013-02-231-1/+0
|\ \ \ \
| * | | | fix mac sdk build.Nick Kralevich2013-02-221-1/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | For now, remove linux/capability.h . We're haven't started using capabilities yet, and this file doesn't exist on mac builds. Change-Id: Id6ec7fdb408bcdfdd538dac65187194c8ee226ff
* | | | Merge "Add support for filesystem capabilities."Nick Kralevich2013-02-232-58/+63
|\ \ \ \
| * | | | Add support for filesystem capabilities.Nick Kralevich2013-02-202-58/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify android_filesystem_config.h and add a capabilities field. This field can be used to add filesystem capabilities to a particular file. Change-Id: If8953a322457ea7275aa6df75660b714e6dc678a
* | | | | Merge "init.rc: allow IPPROTO_ICMP support"Nick Kralevich2013-02-221-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | init.rc: allow IPPROTO_ICMP supportNick Kralevich2013-02-211-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow userspace programs to create IPPROTO_ICMP sockets. This socket type allows an unprivileged program to safely send ICMP_ECHO messages and receive the corresponding ICMP_ECHOREPLY messages, without relying on raw sockets or setuid programs. Please see http://lwn.net/Articles/443051/ for details. In particular, this allows us to use a version of ping which doesn't have any capabilities (https://android-review.googlesource.com/52072). In addition, this allows us to safely implement an IPv4 ICMP based version of InetAddress.isReachable() (https://code.google.com/p/android/issues/detail?id=20106) Change-Id: I876718151efa8219c4f34f573e35e21256fe2316
* | | | Merge "adb: Use 64 bit capabilities."Nick Kralevich2013-02-151-5/+8
|\ \ \ \
| * | | | adb: Use 64 bit capabilities.Nick Kralevich2013-02-151-5/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following kernel warning: $ adb shell dmesg | grep adb <6>[ 7.813003] warning: `adbd' uses 32-bit capabilities (legacy support in use) Change-Id: I3912302c5c577f1cb03f0c591834ab7b3a72ddf5
* | | | Merge "Add a "smash-stack" option to crasher."Elliott Hughes2013-02-142-0/+14
|\ \ \ \
| * | | | Add a "smash-stack" option to crasher.Elliott Hughes2013-02-142-0/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic's __stack_chk_fail was preventing debuggerd from dumping stacks, which was not helpful. Bug: 2487269 Change-Id: Idba2a274037b960dfb2ac1c21686323268c4b372
* | | | am 241194ca: Merge "[MIPS] Benchmark test for MIPS memset16/memset32"Jeffrey Brown2013-02-068-0/+766
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Duane Sand # Via Duane Sand (1) and Gerrit Code Review (1) * commit '241194cad4b27ffd1cb574cb10c4c6941ef3882f': [MIPS] Benchmark test for MIPS memset16/memset32
| * \ \ \ Merge "[MIPS] Benchmark test for MIPS memset16/memset32"Jeffrey Brown2013-02-078-0/+766
| |\ \ \ \
| | * | | | [MIPS] Benchmark test for MIPS memset16/memset32Duane Sand2012-12-278-0/+766
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Chris Dearman <chris@mips.com> AuthorDate: 2011-07-26 19:24:40 Change-Id: I0a7b3360aaf45de8ee47744f7031b84f15f37611
* | | | | | am 44508515: Merge "Tidy up long lines"Jeffrey Brown2013-02-061-4/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Duane Sand # Via Duane Sand (1) and Gerrit Code Review (1) * commit '445085151cff012efefc329b9fa1a311d1d208be': Tidy up long lines
| * | | | | Merge "Tidy up long lines"Jeffrey Brown2013-02-071-4/+7
| |\ \ \ \ \
| | * | | | | Tidy up long linesDuane Sand2012-09-241-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22d90a343c351b90f460b8810bfb4bd28dc0792d