ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6317 commits 1 branch 0 tags 217 MiB
Commit graph

6317 commits

This branch
This branch
All branches
Author SHA1 Message Date
Colin Cross
d64df29699 am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list" 
* commit '9dd40e9756de23a25aaa9909c8d4055105621a76':
  [GNSS] Add AID_GPS to property user white list
 2013-09-03 17:13:35 -07:00
Colin Cross
9dd40e9756 am d171b656: Merge "[GNSS] Add AID_GPS to property user white list" 
* commit 'd171b6567023f7f840b3a145ec27b5723750dc18':
  [GNSS] Add AID_GPS to property user white list
 2013-09-03 17:11:41 -07:00
Colin Cross
d171b65670 Merge "[GNSS] Add AID_GPS to property user white list" 2013-09-04 00:09:30 +00:00
Nick Kralevich
a9f6cc54e7 am f487e07b: am 53132840: Merge "init: call restorecon on /sys" 
* commit 'f487e07bce49735235b91bf5ee79b6987ff80188':
  init: call restorecon on /sys
 2013-09-03 16:47:46 -07:00
Nick Kralevich
164a517bc8 am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel command line" 
* commit '49382f12f2e8278a02019d78482df00bb7f7fad7':
  init: allow disabling selinux via a kernel command line
 2013-09-03 16:47:45 -07:00
Nick Kralevich
a46286db34 am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux into enforcing mode." 
* commit '5fc1acfaabd5de3a8043d0950e4946dda7b6d5c3':
  init: move SELinux into enforcing mode.
 2013-09-03 16:47:45 -07:00
Nick Kralevich
f487e07bce am 53132840: Merge "init: call restorecon on /sys" 
* commit '531328400ed6ce513f9bb4d9d772f02affeeaa26':
  init: call restorecon on /sys
 2013-09-03 16:43:01 -07:00
Nick Kralevich
49382f12f2 am 8328edb0: Merge "init: allow disabling selinux via a kernel command line" 
* commit '8328edb0a7d9f6eb3af82ea8bcda8bf15ffd75ab':
  init: allow disabling selinux via a kernel command line
 2013-09-03 16:43:00 -07:00
Nick Kralevich
5fc1acfaab am b2423399: Merge "init: move SELinux into enforcing mode." 
* commit 'b2423399883094ad1a1ddf7e02d798fd72a283a9':
  init: move SELinux into enforcing mode.
 2013-09-03 16:42:59 -07:00
Nick Kralevich
531328400e Merge "init: call restorecon on /sys" 2013-09-03 23:41:26 +00:00
Nick Kralevich
8328edb0a7 Merge "init: allow disabling selinux via a kernel command line" 2013-09-03 23:41:19 +00:00
Nick Kralevich
b242339988 Merge "init: move SELinux into enforcing mode." 2013-09-03 23:41:09 +00:00
Nick Kralevich
ae76f6dbcf init: call restorecon on /sys 
Not all files on /sys are not getting labeled properly. Fix them.

Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
 2013-09-03 15:55:58 -07:00
Nick Kralevich
935bd3e315 init: allow disabling selinux via a kernel command line 
Create a new "androidboot.selinux" option, to control how userspace
handles SELinux. This kernel command line can have three options:

* disabled
* permissive
* enforcing

"disabled" completely disables userspace support for SELinux. No
policy is ever loaded, nor is the SELinux filesystem /sys/fs/selinux
ever mounted.

"permissive" loads the SELinux policy, but puts SELinux into
permissive mode. SELinux policy violations are logged, but not rejected.

"enforcing", the default, loads the SELinux policy, and places
SELinux into enforcing mode. Policy violations are rejected.

This change addresses post review comments for change
b710ed21de .

Change-Id: I912583db8e6a0e9c63380de32ad8ffc47a8a440f
 2013-09-03 15:55:00 -07:00
Nick Kralevich
56fa0ac6b6 init: move SELinux into enforcing mode. 
When init starts up, immediately put SELinux into enforcing mode.

This is currently a no-op. We currently have everything in the
unconfined domain, so this should not break anything.
(if it does, I'll roll it back immediately)

If the kernel doesn't have SELinux support compiled in, then
don't try loading a policy and continue without SELinux protections.

Change-Id: Id0279cf82c545ea0f7090137b7566a5bc3ddd641
 2013-09-03 15:54:15 -07:00
Lorenzo Colitti
6324776b3e am f3486134: Switch back to subsystem "net" for netlink events. 
* commit 'f34861346d5c207912075fba9874090e4c947869':
  Switch back to subsystem "net" for netlink events.
 2013-09-02 18:09:21 -07:00
Lorenzo Colitti
f34861346d Switch back to subsystem "net" for netlink events. 
The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".

Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.

Bug: 10433320
Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
 2013-09-03 00:25:14 +09:00
Jeff Sharkey
78c984aef2 am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev 
* commit '5835ac9e31aea910adb6b9d2de1d63df771df45b':
  Only check caller when deriving permissions.
 2013-08-30 14:08:49 -07:00
Jeff Sharkey
5835ac9e31 Merge "Only check caller when deriving permissions." into klp-dev 2013-08-30 21:03:41 +00:00
Jeff Sharkey
39ff0ae0f6 Only check caller when deriving permissions. 
Bug: 10547597
Change-Id: Ied909f9047c2567e93dde0f4658d6e4b9ff161ab
 2013-08-30 13:58:13 -07:00
Jeff Sharkey
ab9772641c am 5856fd89: Merge "Fix recursive locking bug." into klp-dev 
* commit '5856fd8935b8aa499930daed29105f6419a96a5e':
  Fix recursive locking bug.
 2013-08-30 13:05:37 -07:00
Jeff Sharkey
5856fd8935 Merge "Fix recursive locking bug." into klp-dev 2013-08-30 20:03:19 +00:00
Jeff Sharkey
aa04e818a4 Fix recursive locking bug. 
handle_rename() would end up acquiring the lock twice.  Change to
always derive has_rw inside earlier locks (instead of acquiring a
second time), and pass the value into check_caller_access_to_name().

Bug: 10547597
Change-Id: If5744d6d226a4785676c19d0f7fdf1c05060ed76
 2013-08-30 10:28:21 -07:00
Dima Zavin
c3c03f12ad am 28e52c81: am b35f68a6: Merge "init: load factory properties" 
* commit '28e52c816d06d78fa823be2d310d9f4c25012c8f':
  init: load factory properties
 2013-08-28 14:14:59 -07:00
Dima Zavin
28e52c816d am b35f68a6: Merge "init: load factory properties" 
* commit 'b35f68a6974589fc3c762d6d2c7bac363794e355':
  init: load factory properties
 2013-08-28 14:12:19 -07:00
Dima Zavin
b35f68a697 Merge "init: load factory properties" 2013-08-28 21:08:43 +00:00
Alex Klyubin
f7f3955d4d am 5f395624: am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3 
* commit '5f39562466688da2f6a0d6fc1588e8a3f5c54971':
  Fix run-as which was broken in Android 4.3
 2013-08-28 13:13:31 -07:00
Alex Klyubin
5f39562466 am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3 
* commit 'aed27f8018e4365aa52a5dd8e89c4db2df0273c5':
  Fix run-as which was broken in Android 4.3
 2013-08-28 13:11:00 -07:00
Alex Klyubin
aed27f8018 am b0739c66: Fix run-as which was broken in Android 4.3 
* commit 'b0739c662db6a19b49c0912b865edb2853156bda':
  Fix run-as which was broken in Android 4.3
 2013-08-28 13:07:48 -07:00
Elliott Hughes
b926493417 am 876f4366: am a7f6e015: Merge "correct msi usb vendor id." 
* commit '876f436668036e8e9d3f86434eee1a44ff5364b8':
  correct msi usb vendor id.
 2013-08-28 08:37:02 -07:00
Elliott Hughes
876f436668 am a7f6e015: Merge "correct msi usb vendor id." 
* commit 'a7f6e015a5cf2ac85549fe676d6641caf6af1291':
  correct msi usb vendor id.
 2013-08-28 08:35:16 -07:00
Elliott Hughes
a7f6e015a5 Merge "correct msi usb vendor id." 2013-08-28 15:31:51 +00:00
astonehuang
48c5d7b6cd correct msi usb vendor id. 
Change-Id: I13128531b8dd7758abddce47ce1c119381773c26
 2013-08-28 10:53:17 +08:00
Elliott Hughes
9fe7014d05 am bfe8e68a: am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue" 
* commit 'bfe8e68a251046fe9a0d9838f4cecaeea19eaa6c':
  Fix build with gcc-4.8 and array boundaries issue
 2013-08-27 10:15:50 -07:00
Elliott Hughes
bfe8e68a25 am 2e5157fa: Merge "Fix build with gcc-4.8 and array boundaries issue" 
* commit '2e5157fa05dca31b2d409c185a6ca5230182503d':
  Fix build with gcc-4.8 and array boundaries issue
 2013-08-27 10:13:52 -07:00
Elliott Hughes
2e5157fa05 Merge "Fix build with gcc-4.8 and array boundaries issue" 2013-08-27 17:12:01 +00:00
Benoit Goby
3bb2be7499 am f0eec130: am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" 
* commit 'f0eec1301dc629bfbaf71f1d2db8be0449d7ec97':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
 2013-08-26 15:18:43 -07:00
Benoit Goby
f0eec1301d am db71324a: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" 
* commit 'db71324a4f3538fa8716ec4d77b3a512598c0527':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
 2013-08-26 15:15:42 -07:00
Benoit Goby
db71324a4f Merge "libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created" 2013-08-26 22:13:20 +00:00
Benoit Goby
7109fddc43 am 7e18e456: Merge "libusbhost: It\'s no longer assumed that "bus/usb" exists once "bus" was created" into klp-dev 
* commit '7e18e45617b73c7a4081202115bb8e5a06ebb1c7':
  libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created
 2013-08-26 15:05:47 -07:00
Michael Wright
2c8fa5eecf am 2f9c5fd4: Merge "Add standard options to readlink" into klp-dev 
* commit '2f9c5fd4b9676c59839c45bf4877551188dbc22a':
  Add standard options to readlink
 2013-08-26 15:03:07 -07:00
Benoit Goby
7e18e45617 Merge "libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created" into klp-dev 2013-08-26 21:58:04 +00:00
Ziv Hendel
8cc80fc894 libusbhost: It's no longer assumed that "bus/usb" exists once "bus" was created 
On some devices there is a slight delay between the creation of "/dev/bus"
and "/dev/bus/usb". Previously, the code assumed that both are created in the
same time which caused "watch_existing_subdirs" to fail and libusbhost to stop
working until the device is rebooted. The fix will setup an inotify event on the
creation of the "bus/usb" so it will not be missed once it's created.

Change-Id: I17f06dd167e61573307425e48898e12ebc954093
 2013-08-26 14:56:39 -07:00
Nicolas SUET
841859f79f [GNSS] Add AID_GPS to property user white list 
Add "gps." and "persist.gps." to property_perms white list.

Change-Id: I7177170676d774c87e08d1548f5264ac27cba3ff
Orig-Change-Id: I7a94caa26be4aefd2fe4f155908e2f8f09858bee
Signed-off-by: Nicolas SUET <nicolas.suet@intel.com>
Signed-off-by: jerome Pantaloni <jeromex.pantaloni@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 118091
 2013-08-26 16:20:18 -04:00
Colin Cross
b69f863455 am 0cbaed42: am a8ba1f2f: Merge "Add support for socket security context specification." 
* commit '0cbaed4211b514dd2aaa4d28f8936ba58e83c6a5':
  Add support for socket security context specification.
 2013-08-23 18:40:12 -07:00
Colin Cross
0cbaed4211 am a8ba1f2f: Merge "Add support for socket security context specification." 
* commit 'a8ba1f2f0b67063978819cc7d04276060450f364':
  Add support for socket security context specification.
 2013-08-23 18:37:57 -07:00
Colin Cross
a8ba1f2f0b Merge "Add support for socket security context specification." 2013-08-24 00:12:03 +00:00
Michael Wright
2f9c5fd4b9 Merge "Add standard options to readlink" into klp-dev 2013-08-23 23:19:56 +00:00
Colin Cross
30caffc025 resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp 
Change-Id: I08e9898940f7cdd466469b76760807cc5d5c67e4
 2013-08-23 14:39:39 -07:00
Colin Cross
a1af5cf6d1 am d8d99c45: Merge "Handle policy reloads within ueventd rather than restarting it." 
* commit 'd8d99c45b704399d50ae0a5e4df938d825c70cfa':
  Handle policy reloads within ueventd rather than restarting it.
 2013-08-23 14:33:46 -07:00