Skip to content
Snippets Groups Projects
  1. Oct 18, 2017
    • Dan Cashman's avatar
      Include 26.0 compat file on system image. · c96721ea
      Dan Cashman authored
      This file is necessary for using an mr1 system image in conjunction
      with an oc-dev vendor image.  This is currently needed by GSI testing,
      for example.
      
      (cherry-pick of commit: 03596f28)
      
      Bug: 66358348
      Test: File is included on system image.
      Change-Id: Ie694061d08acf17453feb596480e42974f8c714c
      c96721ea
  2. Oct 07, 2017
    • Jeff Vander Stoep's avatar
      Allow redeclaring typeattributes · 74b7071b
      Jeff Vander Stoep authored
      Allows partners to add a new attribute definition to their public
      policy without causing a compatibility failure with the AOSP system
      image.
      
      Bug: 67092827
      Bug: 37915794
      Test: build and boot aosp_sailfish with new type declared in public
          policy
      
      Change-Id: I015c26fa7c399423e8a6e7079b5689007d031479
      74b7071b
  3. Oct 05, 2017
    • Jeff Vander Stoep's avatar
      Fix typo and Mac build · e06e4c1e
      Jeff Vander Stoep authored
      FAILED:
      out/target/product/sailfish/obj/ETC/treble_sepolicy_tests_intermediates/treble_sepolicy_tests
      Error: library-path out/host/darwin-x86/lib64/libsepolwrap.so
      does not exist
      
      Note, fixing here instead of reverting to avoid reverting
      changes in CTS.
      
      Test: ctate testing on Mac
      Change-Id: I95f483b152d9bece1a16267cbc49eedb1f902990
      e06e4c1e
  4. Oct 04, 2017
  5. Oct 03, 2017
  6. Oct 02, 2017
    • Dan Cashman's avatar
      Include 26.0 compat file on system image. · f9cd76b1
      Dan Cashman authored
      This file is necessary for using an mr1 system image in conjunction
      with an oc-dev vendor image.  This is currently needed by GSI testing,
      for example.
      
      (cherry-pick of commit: 03596f28)
      
      Bug: 66358348
      Test: File is included on system image.
      Change-Id: I3a6b7ed5edf1c07941bbf835e70f2ae8d03fee25
      f9cd76b1
  7. Sep 27, 2017
    • William Roberts's avatar
      nonplat_property_contexts: use fc_sort vs sort · 3949fe23
      William Roberts authored
      sort respects locale settings, so the value of LC_ALL can affect
      how sort orders things. This can cause labeling issues.
      
      More information on locale and sort can be found via:
        * locale(1) - man 1 locale
        * sort(1) - man 1 sort
        * https://debbugs.gnu.org/cgi/bugreport.cgi?bug=28539
      
      
      
      Rather than deal with this locale setting use fc_sort on
      property contexts. This also has the side-effect of
      stripping comments, and thus sed can be dropped.
      
      Test: This was tested by:
        * comparing outputs to previous runs
        * compile tested *only*.
      
      Change-Id: I1e1eb4dff76f717b5f82f697e677a108abb69892
      Signed-off-by: default avatarWilliam Roberts <william.c.roberts@intel.com>
      3949fe23
    • William Roberts's avatar
      plat_property_contexts: use fc_sort vs sort · 4b44d249
      William Roberts authored
      sort respects locale settings, so the value of LC_ALL can affect
      how sort orders things. Issues have surfaced when CTS build
      servers locale differs from image build server locale. And thus
      the prologue of property_contexts differs with what CTS was
      expecting.
      
      More information on locale and sort can be found via:
        * locale(1) - man 1 locale
        * sort(1) - man 1 sort
        * https://debbugs.gnu.org/cgi/bugreport.cgi?bug=28539
      
      
      
      Rather than deal with this locale setting use fc_sort on
      property contexts. This also has the side-effect of
      stripping comments, and thus sed can be dropped.
      
      Test: This was tested by:
        * comparing outputs to previous runs
        * booting the x86-64 emulator
      
      Change-Id: I144ef549cc11d9c61849ffc0e1b1b000f1b8d1a8
      Signed-off-by: default avatarWilliam Roberts <william.c.roberts@intel.com>
      4b44d249
  8. Sep 26, 2017
  9. Sep 23, 2017
  10. Sep 06, 2017
  11. Aug 25, 2017
  12. Aug 23, 2017
    • Jeff Vander Stoep's avatar
      move build dependencies to sepolicy · 13fb5ed3
      Jeff Vander Stoep authored
      Some selinux build packages are defined in embedded.mk,
      others are defined in system/sepolicy/Android.mk. Move all
      to sepolicy as a dependency of the phony package selinux_policy
      which is defined in embedded.mk.
      
      Test: build Marlin (Treble) and Angler (non-Treble)
      Merged-In: Ib0443ad3da600447fbb51f2e9f91de04dcf5f9f6
      Change-Id: Ib0443ad3da600447fbb51f2e9f91de04dcf5f9f6
      13fb5ed3
  13. Jun 14, 2017
    • Sandeep Patil's avatar
      build: run neverallow checks on platform sepolicy · cfb6f352
      Sandeep Patil authored
      
      This will prevent us from breaking our own neverallow rules
      in the platform sepolicy regardless of vendor policy adding
      exceptions to the neverallow rules using "*_violators" attributes
      
      Bug: 62616897
      Bug: 62343727
      
      Test: Build policy for sailfish
      Test: Build policy with radio to rild socket rule enabled for all
            and ensure the build fails
      
      Change-Id: Ic66ec3e10c76a7c9a17669e0d3deb3a1c7b00809
      Signed-off-by: default avatarSandeep Patil <sspatil@google.com>
      cfb6f352
  14. Jun 13, 2017
    • Jeff Vander Stoep's avatar
      Build split file_contexts for recovery · b236eb6c
      Jeff Vander Stoep authored
      [    7.674739] selinux: selinux_android_file_context: Error getting
      file context handle (No such file or directory)
      
      Bug: 62564629
      Test: build and flash marlin. Successfully switch between regular
          and recovery modes
      
      Change-Id: I0f871f8842d95322c844fb7b13ad1b4b42578e35
      b236eb6c
  15. Jun 10, 2017
    • Jeff Vander Stoep's avatar
      Move non-treble devices to split file_contexts · 7a68c5ae
      Jeff Vander Stoep authored
      This change is primarily to fix CTS which checks file ordering of
      file_contexts. Having two separate means of loading file_contexts
      has resulted in ordering variations.
      
      Previously the binary file_contexts was preferred since it
      loaded faster. However with the move to libpcre2, there is no
      difference in loading time between text and binary file_contexts.
      This leaves us with build system complexity with no benefit.
      Thus removing this unnecessary difference between devices.
      
      Bug: 38502071
      Test: build and boot non-Treble Bullhead, run CTS tests below
      Test: build and boot Treble Marlin, run CTS tests below
      Test: cts-tradefed run singleCommand cts --skip-device-info \
          --skip-preconditions --skip-connectivity-check --abi arm64-v8a \
          --module CtsSecurityHostTestCases \
          -t android.security.cts.SELinuxHostTest#testAospFileContexts
      Test: cts-tradefed run singleCommand cts --skip-device-info \
          --skip-preconditions --skip-connectivity-check --abi arm64-v8a \
          --module CtsSecurityHostTestCases \
          -t android.security.cts.SELinuxHostTest#testValidFileContexts
      Change-Id: I088b3aeafaaab320f6658feb058a1fb89cbb65e1
      7a68c5ae
    • Jeff Vander Stoep's avatar
      Move non-treble devices to split file_contexts · f965a0a1
      Jeff Vander Stoep authored
      This change is primarily to fix CTS which checks file ordering of
      file_contexts. Having two separate means of loading file_contexts
      has resulted in ordering variations.
      
      Previously the binary file_contexts was preferred since it
      loaded faster. However with the move to libpcre2, there is no
      difference in loading time between text and binary file_contexts.
      This leaves us with build system complexity with no benefit.
      Thus removing this unnecessary difference between devices.
      
      Bug: 38502071
      Test: build and boot non-Treble Bullhead, run CTS tests below
      Test: build and boot Treble Marlin, run CTS tests below
      Test: cts-tradefed run singleCommand cts --skip-device-info \
          --skip-preconditions --skip-connectivity-check --abi arm64-v8a \
          --module CtsSecurityHostTestCases \
          -t android.security.cts.SELinuxHostTest#testAospFileContexts
      Test: cts-tradefed run singleCommand cts --skip-device-info \
          --skip-preconditions --skip-connectivity-check --abi arm64-v8a \
          --module CtsSecurityHostTestCases \
          -t android.security.cts.SELinuxHostTest#testValidFileContexts
      Change-Id: I088b3aeafaaab320f6658feb058a1fb89cbb65e1
      f965a0a1
  16. Jun 06, 2017
    • Dan Cashman's avatar
      Hide grep filename output. · c234ba38
      Dan Cashman authored
      checkseapp does not expect filenames before the appearance of neverallow
      rules against which to check.  They had previously been hidden by default
      because they were only gathered from one file, but with the addition of
      the BOARD_PLAT_[PUBLIC|PRIVATE]_SEPOLICY_DIRS to allow for /system policy
      extensions, this may change.
      
      Bug: 36467375
      Bug: 62357603
      Test: Builds with seapp_contexts extension.
      Change-Id: I270bd60ae368aa3c082299d57c4bf12936ac2073
      c234ba38
  17. Jun 05, 2017
  18. Jun 02, 2017
  19. May 25, 2017
    • Dan Cashman's avatar
      Restrict BOARD_PLAT_[PUBLIC|PRIVATE]_SEPOLICY_DIRS to one dir. · 51455fe9
      Dan Cashman authored
      These directories were added to allow for partner extensions to the
      android framework without needing to add changes to the AOSP global
      sepolicy.  There should only ever be one owner of the framework and
      corresponding updates, so enforce this restriction to prevent
      accidental accrual of policy in the system image.
      
      Bug: 36467375
      Test: Add public and private files to policy and verify that they are
      added to the appropriate policy files.  Also test that specifying
      multiple directories for public or private results in an error.
      
      Change-Id: I397ca4e7d6c8233d1aefb2a23e7b44315052678f
      Merged-In: I397ca4e7d6c8233d1aefb2a23e7b44315052678f
      (cherry picked from commit 1633da06)
      51455fe9
    • Dan Cashman's avatar
      Add BOARD_PLAT_[PUBLIC|PRIVATE]_SEPOLICY_DIRS · 1b0a71f3
      Dan Cashman authored
      Add new build variables for partner customization (additions) to platform sepolicy.
      This allows partners to add their own policy without having to touch the AOSP sepolicy
      directories and potentially disrupting compatibility with an AOSP system image.
      
      Bug: 36467375
      Test: Add public and private files to sailfish policy and verify that they are
      added to the appropriate policy files, but that the policy is otherwise identical.
      Also add private/mapping/*.cil files in both locations and change the BOARD_SEPOLICY_VERS
      to trigger use of prebuilt mapping files and verify that they are appropriately
      combined and built in policy.
      
      Change-Id: I38efe2248520804a123603bb050bba75563fe45c
      Merged-In: I38efe2248520804a123603bb050bba75563fe45c
      (cherry picked from commit f893700c)
      1b0a71f3
  20. May 23, 2017
    • Dan Cashman's avatar
      Restrict BOARD_PLAT_[PUBLIC|PRIVATE]_SEPOLICY_DIRS to one dir. · 1633da06
      Dan Cashman authored
      These directories were added to allow for partner extensions to the
      android framework without needing to add changes to the AOSP global
      sepolicy.  There should only ever be one owner of the framework and
      corresponding updates, so enforce this restriction to prevent
      accidental accrual of policy in the system image.
      
      Bug: 36467375
      Test: Add public and private files to policy and verify that they are
      added to the appropriate policy files.  Also test that specifying
      multiple directories for public or private results in an error.
      
      Change-Id: I397ca4e7d6c8233d1aefb2a23e7b44315052678f
      1633da06
  21. May 11, 2017
    • Dan Cashman's avatar
      Fix ASAN build. · 5e9451b1
      Dan Cashman authored
      Test: Build with ASAN on.
      Bug: 36467375
      Change-Id: Id6a07b7bd48f39326b7c7ab47cfde396f7cfd033
      5e9451b1
  22. May 09, 2017
    • Dan Cashman's avatar
      Add BOARD_PLAT_[PUBLIC|PRIVATE]_SEPOLICY_DIRS · f893700c
      Dan Cashman authored
      Add new build variables for partner customization (additions) to platform sepolicy.
      This allows partners to add their own policy without having to touch the AOSP sepolicy
      directories and potentially disrupting compatibility with an AOSP system image.
      
      Bug: 36467375
      Test: Add public and private files to sailfish policy and verify that they are
      added to the appropriate policy files, but that the policy is otherwise identical.
      Also add private/mapping/*.cil files in both locations and change the BOARD_SEPOLICY_VERS
      to trigger use of prebuilt mapping files and verify that they are appropriately
      combined and built in policy.
      Change-Id: I38efe2248520804a123603bb050bba75563fe45c
      f893700c
  23. May 04, 2017
  24. May 03, 2017
    • Ian Pedowitz's avatar
      Revert "O is API 26" · 6b04a961
      Ian Pedowitz authored
      This reverts commit 8713882b.
      
      Reason for revert:  b/37355569
      
      Bug: 37480230
      Bug: 37896931
      Bug: 37355569
      Change-Id: Ic07d948fd0b4a0a8434e1f4f0c8e559c4258cf5e
      6b04a961
  25. May 02, 2017
    • Michael Wright's avatar
      O is API 26 · 8713882b
      Michael Wright authored
      Bug: 37480230
      Bug: 37896931
      Test: build, boot
      Change-Id: Ib8d4309d37b8818163a17e7d8b25155c4645edcf
      8713882b
  26. May 01, 2017
  27. Apr 28, 2017
  28. Apr 24, 2017
    • Jeff Vander Stoep's avatar
      Android.mk: fix dependency typo · 5edd96d9
      Jeff Vander Stoep authored
      Bug: 37646565
      Test: build marlin-userdebug
      Change-Id: I3325d027fa7bdafb48f1f53ac052f2a68352c1dc
      5edd96d9
    • Jeff Vander Stoep's avatar
      Retain neverallow rules in CIL files · b8787693
      Jeff Vander Stoep authored
      Fixes issue where attributes used exlusively in neverallow
      rules were removed from policy.
      
      For on-device compile use the -N flag to skip neverallow tests.
      
      Policy size increases:
      vendor/etc/selinux/nonplat_sepolicy.cil 547849 -> 635637
      vendor/etc/selinux/precompiled_sepolicy 440248 -> 441076
      system/etc/selinux/plat_sepolicy.cil    567664 -> 745230
      
      For a total increase in system/vendor: 266182.
      
      Boot time changes:
      Pixel uses precompiled policy so boot time is not impacted.
      When forcing on-device compile on Marlin selinux policy compile
      time increases 510-520 ms -> 550-560 ms.
      
      Bug: 37357742
      Test: Build and boot Marlin.
      Test: Verify both precompiled and on-device compile work.
      Change-Id: Ib3cb53d376a96e34f55ac27d651a6ce2fabf6ba7
      b8787693
  29. Apr 15, 2017
    • Jeff Vander Stoep's avatar
      secilc: expand generated attributes on non-treble devices · 748cae86
      Jeff Vander Stoep authored
      Attributes added to the policy by the policy compiler are causing
      performance issues. Telling the compiler to expand these
      auto-generated attributes to their underlying types prevents
      preemtion during policy lookup.
      
      Bug: 3650825
      Test: Build and boot Bullhead
      Change-Id: I9a33f5efb1e7c25d83dda1ea5dfe663b22846a2f
      748cae86
  30. Apr 13, 2017
    • Martijn Coenen's avatar
      Add hwservice_contexts and support for querying it. · 3ea47b92
      Martijn Coenen authored
      hwservicemanager can check hwservice_contexts files
      both from the framework and vendor partitions.
      
      Initially, have a wildcard '*' in hwservice_contexts
      that maps to a label that can be added/found from
      domain. This needs to be removed when the proper policy
      is in place.
      
      Also, grant su/shell access to hwservicemanager list
      operations, so tools like 'lshal' continue to work.
      
      Bug: 34454312
      Test: Marlin boots
      Change-Id: I3a02d97a82458692b528d85c1b8e78b6f82ea1bc
      3ea47b92
    • Jeff Vander Stoep's avatar
      secilc: expand generated attributes · ac171b44
      Jeff Vander Stoep authored
      Attributes added to the policy by the policy compiler are causing
      performance issues. Telling the compiler to expand these
      auto-generated attributes to their underlying types prevents
      preemtion during policy lookup.
      
      With this patch the number of attributes in policy drops from
      845 to 475. The number of attributes assigned to the bluetooth domain
      drops from 41 to 11.
      
      Bug: 3650825
      Test: Build and boot Marlin
      Change-Id: Ica06e82001eca323c435fe13c5cf4beba74999e2
      ac171b44
  31. Apr 12, 2017
    • Dan Cashman's avatar
      Fix build part 2. Always create platform_mapping_file. · 4d24a775
      Dan Cashman authored
      commit 552fb537 fixed an undefined
      module error by removing the module when not defined (on non-treble
      devices), but the sepolicy build on non-treble devices was changed
      to rely on the split treble files, even though the split is not used.
      Change this so that the file is always present, to allow policy
      compilation.
      
      Test: policy fully builds.
      Change-Id: Ia0934c739336cea54228bbff8d6644aa3ae501e5
      4d24a775
    • Dan Cashman's avatar
      Fix build: encase $(platform_mapping_file) module in treble block. · 552fb537
      Dan Cashman authored
      Specifying an empty module causes a build error, so make sure that
      if there is no $(platform_mapping_file) the MODULE is not included.
      
      Test: Makefiles parsed without error.
      Change-Id: Ie99e6534c388a3d42bf90cdfef5ee64d5c640fa0
      552fb537
    • Dan Cashman's avatar
      Remove BOARD_SEPOLICY_VERS_DIR build variable. · 6bf50e5c
      Dan Cashman authored
      The original purpose of BOARD_SEPOLICY_VERS_DIR was to allow the
      specification of an alternate platform public policy, primarily for
      testing purposes.  This should not be a part of the released platform,
      since the only public policy and corresponding mapping file construction
      should be based on the current public platform policy, with compatibility
      with vendor policy targeting previous versions provided by static mapping
      files.  Its continued presence muddles the generation of mapping files by
      potentially introducing a situation in which an incorrect mapping file is
      generated.  Remove it.
      
      Bug: 36783775
      Test: Device boots with compiled SELinux policy (SHA256s don't match for
      precompiled policy).
      
      Change-Id: I9e2100a7d709c9c0949f4e556229623961291a32
      6bf50e5c
Loading