Commit graph

5243 commits

Author SHA1 Message Date
Alex Ray
81b5b5fb02 sync: factor sw_sync functionality out of header
Change-Id: I13127abe1cd07cd52b35ff43902579478505ccf4
2013-03-05 15:53:24 -08:00
Keun young Park
f5eb803543 move goldfish stuffs to device/generic/goldfish
- each files will be pulled in emulator.mk as PRODUCT_COPY_FILES

Change-Id: I4772e2fd863e6d2663f477c3acd8a90cb95b498a
2013-03-05 11:16:36 -08:00
Colin Cross
95b087fa90 am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"
* commit '79d4381a8e838d7ddbeda5b7dc90e0c5bca5a8c6':
  Fix issues where the filename is referred to as 'sideload'
2013-03-05 18:52:29 +00:00
Colin Cross
7c646cd359 am af4ececc: am 515bed0e: Merge "run-as: set the SELinux security context."
* commit 'af4ececc7bd10aec1240acfbfe7756ab8ee16883':
  run-as:  set the SELinux security context.
2013-03-05 18:52:28 +00:00
Colin Cross
79d4381a8e am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'"
* commit '69f3ec84cf4e9a1bf4c222b88b4413da407331b5':
  Fix issues where the filename is referred to as 'sideload'
2013-03-05 10:27:41 -08:00
Colin Cross
af4ececc7b am 515bed0e: Merge "run-as: set the SELinux security context."
* commit '515bed0e6aae4a835ab4393499c7dd99941a8423':
  run-as:  set the SELinux security context.
2013-03-05 10:27:40 -08:00
Colin Cross
69f3ec84cf Merge "Fix issues where the filename is referred to as 'sideload'" 2013-03-05 17:33:54 +00:00
Colin Cross
515bed0e6a Merge "run-as: set the SELinux security context." 2013-03-05 17:31:38 +00:00
Magnus Eriksson
86ae6d587b Fix issues where the filename is referred to as 'sideload'
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>
2013-03-05 07:37:32 +01:00
Nick Kralevich
d1439a7f8e am b3be89df: am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as"
* commit 'b3be89dfe9e0eb1cb0fbf834d6fbcef976c03a1e':
  android_filesystem_config.h: change ping and run-as
2013-03-01 22:14:52 +00:00
Nick Kralevich
b3be89dfe9 am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as"
* commit '3fb63338e9faddeb50a582cfec114bd48f93f1c2':
  android_filesystem_config.h: change ping and run-as
2013-03-01 14:11:00 -08:00
Nick Kralevich
3fb63338e9 Merge "android_filesystem_config.h: change ping and run-as" 2013-03-01 21:42:27 +00:00
Nick Kralevich
fe8135739c android_filesystem_config.h: change ping and run-as
/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
2013-03-01 13:18:41 -08:00
Nick Kralevich
277626e59d am 844306bd: am cc4499b6: Merge "adb: use correct header file."
* commit '844306bd9cb3c8b3e514e5d91e9514556e8f95f4':
  adb: use correct header file.
2013-02-28 23:22:04 +00:00
Nick Kralevich
844306bd9c am cc4499b6: Merge "adb: use correct header file."
* commit 'cc4499b6fa9ad4cbe285d78754edcb6dd30ab893':
  adb: use correct header file.
2013-02-28 15:20:41 -08:00
Nick Kralevich
cc4499b6fa Merge "adb: use correct header file." 2013-02-28 22:53:33 +00:00
Nick Kralevich
e2864bf727 adb: use correct header file.
Change-Id: I7a66ced762dc077247fd7c2714ae8850ffdcaeb9
2013-02-28 14:12:58 -08:00
Nick Kralevich
4c609e9683 Remove CAP_NET_RAW from adb
ping no longer needs CAP_NET_RAW. See:

* http://lwn.net/Articles/443051/
* https://android-review.googlesource.com/52090
* https://android-review.googlesource.com/52072

Eliminate the CAP_NET_RAW special case in adb

Change-Id: If9d32c5254291b123b06bededc94b64113f6b8f2
2013-02-27 13:15:02 -08:00
Nick Kralevich
09094e729b am 96f60a8c: am ff03bc30: Merge "fix mac sdk build."
* commit '96f60a8cf8a6e8e8c077339a27e417cd15645e1b':
  fix mac sdk build.
2013-02-22 21:44:07 -08:00
Nick Kralevich
96f60a8cf8 am ff03bc30: Merge "fix mac sdk build."
* commit 'ff03bc3024cb60d1840552f4e966f5b616fd861f':
  fix mac sdk build.
2013-02-22 21:41:43 -08:00
Nick Kralevich
ff03bc3024 Merge "fix mac sdk build." 2013-02-23 04:36:16 +00:00
Nick Kralevich
bb05a92cb1 fix mac sdk build.
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
2013-02-22 20:32:35 -08:00
Nick Kralevich
89b530d215 am 0d060d56: am e3f247c0: Merge "Add support for filesystem capabilities."
* commit '0d060d56d25e41e61dd46e348bff3c875cbc85cd':
  Add support for filesystem capabilities.
2013-02-22 18:31:42 -08:00
Nick Kralevich
0d060d56d2 am e3f247c0: Merge "Add support for filesystem capabilities."
* commit 'e3f247c0e55d8bfd7df66532e807e38983c47761':
  Add support for filesystem capabilities.
2013-02-22 18:28:13 -08:00
Nick Kralevich
e3f247c0e5 Merge "Add support for filesystem capabilities." 2013-02-23 02:03:36 +00:00
Ken Sumrall
6c2c121386 fs_mgr: add support for new recoveryonly flag
If a device has an ext4 partition that contains the radio
firmware, and that filesystem is not mounted in normal
operation, we need a flag to prevent mount_all from
mounting it, so the new flag recoveryonly was added.

Change-Id: I361800c494e751b04c4faf956870f15fd0d8fe20
2013-02-22 17:40:58 -08:00
Glenn Kasten
65e203070c Merge "Add directory for mediaserver" 2013-02-23 01:04:33 +00:00
Glenn Kasten
b0f908a957 Add directory for mediaserver
Bug: 8223560
Change-Id: Iccc6d439a848445cac0f5b30d1d663aed3f5344e
2013-02-22 14:54:45 -08:00
The Android Open Source Project
2448146982 am f6451116: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f6451116423c6195a464b69b6e07aa8ef743e6b1':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
2013-02-22 13:45:37 -08:00
The Android Open Source Project
f645111642 Reconcile with jb-mr1-release - do not merge
Change-Id: Ie31a50f2edd4ef863f56f8939fcf8e806fb2ba0a
2013-02-22 13:42:53 -08:00
Nick Kralevich
fe8425b5c5 am c5ce4108: am 1b64957a: Merge "init.rc: allow IPPROTO_ICMP support"
* commit 'c5ce4108facc5a1b94fcf9469a189b2cbdfd5e76':
  init.rc: allow IPPROTO_ICMP support
2013-02-22 09:44:34 -08:00
Nick Kralevich
c5ce4108fa am 1b64957a: Merge "init.rc: allow IPPROTO_ICMP support"
* commit '1b64957a7952738b02d437ffe3d4de45127a160c':
  init.rc: allow IPPROTO_ICMP support
2013-02-22 09:42:12 -08:00
Nick Kralevich
1b64957a79 Merge "init.rc: allow IPPROTO_ICMP support" 2013-02-22 16:33:46 +00:00
Ken Sumrall
320abd3887 Merge "fs_mgr: support a unified fstab format." 2013-02-22 06:22:12 +00:00
Nick Kralevich
be341cc348 init.rc: allow IPPROTO_ICMP support
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
2013-02-21 19:28:13 -08:00
Benoit Goby
1531c966c1 Merge "adb: Fix secure adb when booting with usb attached" 2013-02-21 23:55:57 +00:00
Ed Heyl
747b0cf109 Merge remote-tracking branch 'goog/jb-mr2-release' 2013-02-20 13:47:35 -08:00
Nick Kralevich
e9e74f3c88 Add support for filesystem capabilities.
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
2013-02-20 12:51:28 -08:00
The Android Automerger
70012fcd2f merge in jb-mr2-release history after reset to master 2013-02-20 05:57:02 -08:00
JP Abgrall
d3297c2bab Merge "logwrap lib: make logwrapper less verbose when told to not log" 2013-02-20 07:17:32 +00:00
Ken Sumrall
ab6b852235 fs_mgr: support a unified fstab format.
Update fs_mgr to support more flags needed to unify the 3
fstabs currently in android into one.

Change-Id: Ie46cea61a5b19882c55098bdd70f39e78fb603be
2013-02-19 10:18:42 -08:00
The Android Automerger
c3215217a0 merge in jb-mr2-release history after reset to master 2013-02-19 09:52:53 -08:00
Nick Kralevich
080427e4e2 adb: drop capability bounding set on user builds
run-as: don't require CAP_DAC_OVERRIDE.

Prevent an adb spawned application from acquiring capabilities
other than

* CAP_NET_RAW
* CAP_SETUID
* CAP_SETGID

The only privileged programs accessible on user builds are
* /system/bin/ping
* /system/bin/run-as

and the capabilities above are sufficient to cover those
two programs.

If the kernel doesn't support file capabilities, we ignore
a prctl(PR_CAPBSET_DROP) failure. In a future CL, this could
become a fatal error.

Change-Id: I45a56712bfda35b5ad9378dde9e04ab062fe691a
2013-02-15 21:22:19 -08:00
Mathias Agopian
bcfa910611 Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: Ie745d9adf5465834bb8bf751a2f88b19435fdf46
2013-02-15 12:48:01 -08:00
Nick Kralevich
b9c087031b am e149855a: am 523a2090: Merge "adb: Use 64 bit capabilities."
* commit 'e149855a816c98149a95725139ae66f193049ddd':
  adb: Use 64 bit capabilities.
2013-02-15 10:22:08 -08:00
Nick Kralevich
e149855a81 am 523a2090: Merge "adb: Use 64 bit capabilities."
* commit '523a20901b2afce7ad02c0011d70ed57f8bbb997':
  adb: Use 64 bit capabilities.
2013-02-15 10:19:40 -08:00
Nick Kralevich
523a20901b Merge "adb: Use 64 bit capabilities." 2013-02-15 18:07:46 +00:00
Nick Kralevich
109f4e16cb adb: Use 64 bit capabilities.
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
2013-02-15 09:33:13 -08:00
Elliott Hughes
3b7c584fe9 am 910b7a8b: am 17361134: Merge "Add a "smash-stack" option to crasher."
# Via Android Git Automerger (1) and others
* commit '910b7a8b88b29ee16c6014630b450dda56c5d578':
  Add a "smash-stack" option to crasher.
2013-02-14 16:21:04 -08:00
Elliott Hughes
910b7a8b88 am 17361134: Merge "Add a "smash-stack" option to crasher."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '17361134180b178531979897f9c9867346a57f10':
  Add a "smash-stack" option to crasher.
2013-02-14 16:16:26 -08:00