Android-x86
Fork
Spenden

  • R/O
  • HTTP
  • SSH
  • HTTPS

system-core: Commit

system/core


Commit MetaInfo

Revision9b56516f197ea35bb46294da6892c5f879ba6af5 (tree)
Zeit2019-11-23 12:41:14
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

init: set default selinux mode to permissive

To support selinux enforcing mode, we still have a long way to go.
Let's set the default mode to permissive.

Ändern Zusammenfassung

Diff

--- a/init/Android.mk
+++ b/init/Android.mk
@@ -13,7 +13,7 @@ init_options += \
1313 else
1414 init_options += \
1515 -DALLOW_LOCAL_PROP_OVERRIDE=0 \
16- -DALLOW_PERMISSIVE_SELINUX=0 \
16+ -DALLOW_PERMISSIVE_SELINUX=1 \
1717 -DREBOOT_BOOTLOADER_ON_PANIC=0 \
1818 -DDUMP_ON_UMOUNT_FAILURE=0
1919 endif
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -573,11 +573,11 @@ static void selinux_init_all_handles(void)
573573 enum selinux_enforcing_status { SELINUX_PERMISSIVE, SELINUX_ENFORCING };
574574
575575 static selinux_enforcing_status selinux_status_from_cmdline() {
576- selinux_enforcing_status status = SELINUX_ENFORCING;
576+ selinux_enforcing_status status = SELINUX_PERMISSIVE;
577577
578578 import_kernel_cmdline(false, [&](const std::string& key, const std::string& value, bool in_qemu) {
579- if (key == "androidboot.selinux" && value == "permissive") {
580- status = SELINUX_PERMISSIVE;
579+ if (key == "androidboot.selinux" && value == "enforcing") {
580+ status = SELINUX_ENFORCING;
581581 }
582582 });
583583
Show on old repository browser