Commit Graph

6345 Commits

Author SHA1 Message Date
William Luh 5249306ad0 Add new cert_pin_failure tag that can be used in user-consent filtering.
Change-Id: If8a2f9829b3aac4abc33a4623c5f5b4966fd6870
2013-09-09 11:18:33 -07:00
Ben Cheng 2d0c5d168f am 61e4b4d5: am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."
* commit '61e4b4d5a8a948c4241c26627cf8d6cb9d0544ca':
  Add -Wno-unused-parameter to suppress the warning.
2013-09-04 14:12:02 -07:00
Ben Cheng 61e4b4d5a8 am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."
* commit '8fb85b37af1753ce6bc5d88a04485a6c805bb3a3':
  Add -Wno-unused-parameter to suppress the warning.
2013-09-04 14:08:55 -07:00
Ben Cheng 8fb85b37af am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."
* commit '2b2f1ae86fb791e9f2fff25f93e7f2c4db010bf6':
  Add -Wno-unused-parameter to suppress the warning.
2013-09-04 14:05:40 -07:00
Ben Cheng 2b2f1ae86f Merge "Add -Wno-unused-parameter to suppress the warning." 2013-09-04 21:03:05 +00:00
Ben Cheng c665df33e0 Add -Wno-unused-parameter to suppress the warning.
For example in system/core/libcorkscrew/arch-arm/backtrace-arm.c:

system/core/libcorkscrew/arch-arm/backtrace-arm.c:555:49: error: unused
parameter 'siginfo' [-Werror=unused-parameter]

Change-Id: Ibe13e8761a2f57324c0f0d87d9add549a20aa37a
2013-09-04 13:51:36 -07:00
Colin Cross bf0a6e8309 am d64df296: am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"
* commit 'd64df296998bcb1528067d7e9adc40cf5e47abd1':
  [GNSS] Add AID_GPS to property user white list
2013-09-03 17:15:18 -07:00
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 b6dddf24b8 am a9f6cc54: am f487e07b: am 53132840: Merge "init: call restorecon on /sys"
* commit 'a9f6cc54e7330a03e55291bda1d75bc78f3f8f2a':
  init: call restorecon on /sys
2013-09-03 16:53:47 -07:00
Nick Kralevich 22041903a1 am 164a517b: am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"
* commit '164a517bc89dac39dad069c0e8e7693a677ce573':
  init: allow disabling selinux via a kernel command line
2013-09-03 16:53:46 -07:00
Nick Kralevich 025ebae382 am a46286db: am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux into enforcing mode."
* commit 'a46286db3429d50296f6fb070f948261b21c5c5d':
  init: move SELinux into enforcing mode.
2013-09-03 16:53:46 -07: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 b329d19cdd am 6324776b: am f3486134: Switch back to subsystem "net" for netlink events.
* commit '6324776b3efe46903f9a1291d90b52fcf51e7880':
  Switch back to subsystem "net" for netlink events.
2013-09-02 18:11:04 -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
Todd Poynor aacded7019 init.rc: start lmkd
Change-Id: Ibebab31e1f41a210821834a1d65f196b39bb6601
2013-08-30 15:32:09 -07:00
Todd Poynor 3948f80f2a Add lmkd low memory killer daemon
Move kernel low memory killer logic to new daemon lmkd.  ActivityManager
communicates with this daemon over a named socket.

Change-Id: Ie957da7e9b1f7150e23c689fdadf23ff260b47be
2013-08-30 15:32:09 -07:00
Jeff Sharkey 3912701e5e am 78c984ae: am 5835ac9e: Merge "Only check caller when deriving permissions." into klp-dev
* commit '78c984aef222654bd337ae7f466a526e23db8f07':
  Only check caller when deriving permissions.
2013-08-30 14:13:44 -07: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 5c0ae41778 am ab977264: am 5856fd89: Merge "Fix recursive locking bug." into klp-dev
* commit 'ab9772641cad9342e615b21e5a4afb665e40cacf':
  Fix recursive locking bug.
2013-08-30 13:07:44 -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 f8f64988dd am c3c03f12: am 28e52c81: am b35f68a6: Merge "init: load factory properties"
* commit 'c3c03f12ad5397588af639178ad200b56787790a':
  init: load factory properties
2013-08-28 14:48:10 -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 61d1b4420c am f7f3955d: am 5f395624: am aed27f80: am b0739c66: Fix run-as which was broken in Android 4.3
* commit 'f7f3955d4d7cf78914395ddb47400d1237bf4bc2':
  Fix run-as which was broken in Android 4.3
2013-08-28 14:07:11 -07: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 e7aa5baef0 am b9264934: am 876f4366: am a7f6e015: Merge "correct msi usb vendor id."
* commit 'b92649341718984bf91a09a3e9dddf04b844c567':
  correct msi usb vendor id.
2013-08-28 08:39:05 -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