Skip to content
Snippets Groups Projects
  1. Apr 06, 2017
    • Dan Cashman's avatar
      Move mapping_sepolicy.cil to /system partition. · 0e9c47c0
      Dan Cashman authored
      This is a necessary first step to finalizing the SELinux policy build
      process.  The mapping_sepolicy.cil file is required to provide backward
      compatibility with the indicated vendor-targeted version.
      
      This still needs to be extended to provide N mapping files and corresponding
      SHA256 outputs, one for each of the N previous platform versions with which
      we're backward-compatible.
      
      Bug: 36783775
      Test: boot device with matching sha256 and non-matching and verify that
      device boots and uses either precompiled or compiled policy as needed. Also
      verify that mapping_sepolicy.cil has moved.
      
      Change-Id: I5692fb87c7ec0f3ae9ca611f76847ccff9182375
      0e9c47c0
  2. Apr 03, 2017
    • Martijn Coenen's avatar
      Add target for vndservice_contexts. · 6676c234
      Martijn Coenen authored
      So we can limit vndservicemanager access to
      just vndservice_contexts.
      
      Bug: 36052864
      Test: servicemanager,vndservicemanager work
      Change-Id: I7b132d4f616ba1edd0daf7be750d4b7174c4e188
      6676c234
  3. Mar 26, 2017
    • Jeff Vander Stoep's avatar
      Create selinux_policy phony target · d4a3e9dd
      Jeff Vander Stoep authored
      Moves selinux policy build decisions to system/sepolicy/Android.mk.
      This is done because the PRODUCT_FULL_TREBLE variable isn't available
      in embedded.mk and TARGET_SANITIZE isn't available to dependencies of
      init.
      
      Test: Build/boot Bullhead PRODUCT_FULL_TREBLE=false
      Test: Build/boot Marlin PRODUCT_FULL_TREBLE=true
      Test: Build Marlin TARGET_SANITIZE=address. Verify asan rules are
            included in policy output.
      Bug: 36138508
      Change-Id: I20a25ffdfbe2b28e7e0f3e090a4df321e85e1235
      d4a3e9dd
  4. Mar 25, 2017
    • William Roberts's avatar
      build: stop generating $T/file_contexts · 5d0c2e41
      William Roberts authored
      
      secilc is being used without -f which is causing a file_contexts
      file to be generated in the root of the tree where the build tools
      run:
      
      $ stat $T/file_contexts
        File: 'file_contexts'
        Size: 0         	Blocks: 0          IO Block: 4096   regular empty file
      Device: fc00h/64512d	Inode: 5508958     Links: 1
      Access: (0664/-rw-rw-r--)  Uid: ( 1000/wcrobert)   Gid: ( 1000/wcrobert)
      Access: 2017-03-23 11:23:41.691538047 -0700
      Modify: 2017-03-23 11:23:41.691538047 -0700
      Change: 2017-03-23 11:23:41.691538047 -0700
      
      Test: remove $T/file_contexts, touch a policy file and make sepolicy,
            ensure file is not regenerated. Also, ensure hikey builds and
            boots.
      
      Change-Id: I0d15338a540dba0194c65a1436647c7d38fe3c79
      Signed-off-by: default avatarWilliam Roberts <william.c.roberts@intel.com>
      5d0c2e41
  5. Mar 24, 2017
    • Alex Klyubin's avatar
      Mark all clients of Allocator HAL · 7cda44f4
      Alex Klyubin authored
      This change associates all domains which are clients of Allocator HAL
      with hal_allocator_client and the, required for all HAL client
      domains, halclientdomain.
      
      This enables this commit to remove the now unnecessary hwallocator_use
      macro because its binder_call(..., hal_allocator_server) is covered by
      binder_call(hal_allocator_client, hal_allocator_server) added in this
      commit.
      
      Unfortunately apps, except isolated app, are clients of Allocator HAL
      as well. This makes it hard to use the hal_client_domain(...,
      hal_allocator) macro because it translates into "typeattribute" which
      currently does not support being provided with a set of types, such as
      { appdomain -isolated_app }. As a workaround, hopefully until
      typeattribute is improved, this commit expresses the necessary
      association operation in CIL. private/technical_debt.cil introduced by
      this commit is appended into the platform policy CIL file, thus
      ensuring that the hack has effect on the final monolithic policy.
      
      P. S. This change also removes Allocator HAL access from isolated_app.
      Isolated app shouldn't have access to this HAL anyway.
      
      Test: Google Play Music plays back radios
      Test: Google Camera records video with sound and that video is then
            successfully played back with sound
      Test: YouTube app plays back clips with sound
      Test: YouTube in Chrome plays back clips with sound
      Bug: 34170079
      Change-Id: Id00bba6fde83e7cf04fb58bc1c353c2f66333f92
      7cda44f4
    • Alex Klyubin's avatar
      Vendor domains must not use Binder · f5446eb1
      Alex Klyubin authored
      On PRODUCT_FULL_TREBLE devices, non-vendor domains (except vendor
      apps) are not permitted to use Binder. This commit thus:
      * groups non-vendor domains using the new "coredomain" attribute,
      * adds neverallow rules restricting Binder use to coredomain and
        appdomain only, and
      * temporarily exempts the domains which are currently violating this
        rule from this restriction. These domains are grouped using the new
        "binder_in_vendor_violators" attribute. The attribute is needed
        because the types corresponding to violators are not exposed to the
        public policy where the neverallow rules are.
      
      Test: mmm system/sepolicy
      Test: Device boots, no new denials
      Test: In Chrome, navigate to ip6.me, play a YouTube video
      Test: YouTube: play a video
      Test: Netflix: play a movie
      Test: Google Camera: take a photo, take an HDR+ photo, record video with
            sound, record slow motion video with sound. Confirm videos play
            back fine and with sound.
      Bug: 35870313
      Change-Id: I0cd1a80b60bcbde358ce0f7a47b90f4435a45c95
      f5446eb1
  6. Mar 22, 2017
    • Jeff Vander Stoep's avatar
      Grant additional permissions for ASAN builds · 74434848
      Jeff Vander Stoep authored
      ASAN builds may require additional permissions to launch processes
      with ASAN wrappers. In this case, system_server needs permission to
      execute /system/bin/sh.
      
      Create with_asan() macro which can be used exclusively on debug
      builds. Note this means that ASAN builds with these additional
      permission will not pass the security portion of CTS - like any
      other debug build.
      
      Addresses:
      avc: denied { execute } for name="sh" dev="dm-0" ino=571
      scontext=u:r:system_server:s0 tcontext=u:object_r:shell_exec:s0
      tclass=file
      
      Test: lunch aosp_marlin-userdebug;
            cd system/sepolicy; mm SANITIZE_TARGET=address;
            Verify permissions granted using with_asan() are granted.
      Test: lunch aosp_marlin-userdebug;
            cd system/sepolicy; mm;
            Verify permissions granted using with_asan() are not granted.
      Test: lunch aosp_marlin-user;
            cd system/sepolicy; mm SANITIZE_TARGET=address;
            Verify permissions granted using with_asan() are not granted.
      Bug: 36138508
      Change-Id: I6e39ada4bacd71687a593023f16b45bc16cd7ef8
      74434848
  7. Mar 15, 2017
    • Jeff Vander Stoep's avatar
      Specify intermediates dir for sepolicy · d2053bd0
      Jeff Vander Stoep authored
      Policy intermediates are being placed in a seemingly random
      intermediates directories.
      
      Currently:
      out/target/product/marlin/obj_arm/SHARED_LIBRARIES/libsoftkeymaster_intermediates
      
      Instead, place intermediates in the sepolicy_intermediates dir.
      
      Test: intermediates now placed in:
      out/target/product/marlin/obj/ETC/sepolicy_intermediates
      Test: Marlin builds, no change to sepolicy on device.
      Bug: 36269118
      
      Change-Id: Ib6e9d9033be4dc8db0cc66cb47d9dc35d38703fe
      d2053bd0
    • Alex Klyubin's avatar
      Remove unused /selinux_version · e8243518
      Alex Klyubin authored
      This file is no longer needed because it was needed for supporting
      reloadable/dynamic SELinux policy which is no longer supported.
      
      Test: Clean build, flash, device boots without additional denials.
            Reboot to recovery works, no additional denials.
      Bug: 33642277
      Change-Id: I7fffe2fd12f586ed9b3ae54e35d17abdebbe7bce
      e8243518
    • Xin Li's avatar
      Fix build under GitC client. · ec6f393d
      Xin Li authored
      Test: build
      Bug: 36229129
      Change-Id: I0654ce44f344729b0bb1f8716afa151e134fdc6a
      ec6f393d
  8. Mar 13, 2017
    • Alex Klyubin's avatar
      Correct location of property_contexts for TREBLE devices · 9d59041f
      Alex Klyubin authored
      This makes the build system, for TREBLE devices only, place
      plat_property_contexts under /system/etc/selinux and
      nonplat_property_contexts under /vendor/etc/selinux. For other devices
      these files are placed under /, same as before.
      
      This change was previously reverted because it affected the location
      of property_contexts in recovery. Now that we have separate tagets for
      recovery (see ec78c377), this change
      no longer affects is recovery.
      
      Test: *_property_contexts in correct locations when
            PRODUCT_FULL_TREBLE is set to true and when it is set to false.
      
      Test: cts-tradefed run singleCommand cts --skip-device-info \
            --skip-preconditions --skip-connectivity-check \
            --abi arm64-v8a --module CtsSecurityHostTestCases \
            -t android.security.cts.SELinuxHostTest#testAospPropertyContexts
      
            This test was performed on bullhead (non A/B device) and sailfish
            (A/B device).
      
      Test: Clean build, flash, device boots with no additional denials.
            Rebooting to recovery, recovery boots fine with no denials.
            This test was performed on bullhead (non A/B device) and sailfish
            (A/B device).
      Bug: 36002573
      
      (cherry picked from commit 4cb628a3)
      
      Change-Id: I0b145c58669fb31bc39d57f36eef1190425a8328
      9d59041f
    • Alex Klyubin's avatar
      Targets for artifacts needed by recovery · ec78c377
      Alex Klyubin authored
      This ensures that SELinux policy artifact needed by recovery at
      runtime have targets in this build script. This is to make
      recoveryimage/bootimage targets depend on these artifacts explicitly,
      which reduces the element of surprise. Moreover, this enables us to
      move non-recovery artifacts around without affecting recovery
      artifacts.
      
      Test: Clean build, flash, device boots just fine, no new denials.
            Reboot to recovery, recovery boots just fine, no denials.
            This was tested on bullhead (non A/B device) and sailfish (A/B
            device).
      Bug: 33642277
      Change-Id: I3c494d9d7fec5c4f487d38964e572757fcf67f57
      ec78c377
  9. Mar 11, 2017
    • Jeff Vander Stoep's avatar
      Split mac_permissions.xml to /system and /vendor · bba9e7b9
      Jeff Vander Stoep authored
      Test: Build and boot Marlin
      Test: See the following in the logs:
      01-01 02:10:28.756  1345  1345 D SELinuxMMAC: Using policy file /system/etc/selinux/plat_mac_permissions.xml
      01-01 02:10:28.787  1345  1345 D SELinuxMMAC: Using policy file /vendor/etc/selinux/nonplat_mac_permissions.xml
      Bug: 36003167
      
      Change-Id: If17490a2a5d94bfea1fa6d282282d45d67e207e9
      bba9e7b9
  10. Mar 10, 2017
    • Jeff Vander Stoep's avatar
      Move split file_contexts to /system and /vendor · 0cb417a6
      Jeff Vander Stoep authored
      Build file_contexts.bin on legacy builds.
      Test: Marlin and Bullhead build and boot with no new denials.
      Test: Marlin and Bullhead recovery boots with no new denials.
      Test: Bullhead boots with file_contexts.bin in /
      Test: Marlin boot with /system/etc/selinux/plat_file_contexts and
            /vendor/etc/selinux/nonplat_file_contexts.
      Bug: 36002414
      
      Change-Id: Ide8498b3c86234d2f93bb22a7514d132c33067d6
      0cb417a6
    • Alex Klyubin's avatar
      Remove unnecessary recovery-related targets · 84aa7421
      Alex Klyubin authored
      Recovery should always use monolithic policy. Thus, we don't need
      split policy files *.recovery.cil. This commit removes these targets
      and rolls up the relevant parts of the targets into
      "sepolicy.recovery" which is the target which produces monolithic
      policy for recovery.
      
      Test: make clean && make sepolicy.recovery, then confirm that
            repolicy.recovery is identical to the one produced prior to this
            change.
      Test: Clean build, flash, device boots up fine, no new denials. Device
            also boots into recovery just fine, no denials.
      Bug: 31363362
      
      Change-Id: I7f698abe1f17308f2f03f5ed1b727a8b071e94c7
      84aa7421
    • Alex Klyubin's avatar
      Revert "Correct location of property_contexts for TREBLE devices" · 935ddb20
      Alex Klyubin authored
      This reverts commit 4cb628a3.
      
      Reason for revert: recovery image on marlin & sailfish no longer
      contained *property_contexts and thus recovery failed to boot.
      
      Test: Clean build, flash, sailfish and bullhead boot up just fine,
            and boot into recovery just fine.
      Bug: 36002573
      Bug: 36108354
      Change-Id: I2dffd80764f1a464327747d35a58691b24cff7a7
      935ddb20
  11. Mar 09, 2017
  12. Mar 08, 2017
    • Alex Klyubin's avatar
      Correct location of property_contexts for TREBLE devices · 4cb628a3
      Alex Klyubin authored
      This makes the build system, for TREBLE devices only, place
      plat_property_contexts under /system/etc/selinux and
      nonplat_property_contexts under /vendor/etc/selinux. For other devices
      these files are placed under /, same as before.
      
      Test: *_property_contexts in correct locations when
            PRODUCT_FULL_TREBLE is set to true and when it is set to false.
      Bug: 36002573
      
      Change-Id: I7e30e64918bb3ee671fa8c7a2e30ed96a9cc1ad7
      4cb628a3
  13. Mar 07, 2017
    • Alex Klyubin's avatar
      Precompiled kernel policy for on-device use · 193dccda
      Alex Klyubin authored
      This adds build targets for outputing precompiled kernel policy usable
      on devices with policy split between system and vendor partitions. On
      such devices, precompiled policy must reside on the vendor partition.
      
      Because such devices support updating these partitions independently
      of each other, the precompiled policy must reference the system
      partition's policy against which it was compiled. This enables init to
      establish whether the precompiled policy is valid for the current
      combination of system and vendor partitions.
      
      The referencing is performed by both the system and vendor partitions
      including the SHA-256 digest of the system partition's policy
      (plat_sepolicy.cil). Only the when the digest is the same on both
      partitions can the precompiled policy be used.
      
      Test: plat_sepolicy.cil.sha256 contains exactly the hex form of the
            SHA-256 digest of plat_sepolicy.cil
      Test: plat_sepolicy.cil.sha256 is identical
            precompiled_sepolicy.plat.sha256.
      Bug: 31363362
      Change-Id: I9771e1aa751e25bba6e2face37d68e0ae43b33a3
      193dccda
    • Jeff Vander Stoep's avatar
      assert plat neverallows on nonplat seapp_contexts · 87ae5f7d
      Jeff Vander Stoep authored
      With the plat/nonplat policy split, nonplat_seapp_contexts should still
      be checked against the plat_seapp_contexts_neverallows during build
      time to ensure no violations occur.
      
      Test: stock aosp_marlin builds.
      Test: name=foo.bar seinfo=default fails (as expected) in nonplat policy
      Test: name=foo.bar seinfo="" fails (as expected) in nonplat policy
      Bug: 36002816
      Change-Id: I95b2c695b23e2bdf420575d631e85391e93fc869
      87ae5f7d
  14. Mar 03, 2017
    • Alex Klyubin's avatar
      Move split sepolicy to correct locations · 052b0bbb
      Alex Klyubin authored
      This moves the CIL files comprising the split sepolicy to the
      directories/partitions based on whether the file is part of
      platform/system or non-platform/vendor. In particular:
      * plat_sepolicy.cil is moved to /system/etc/selinux,
      * nonplat_sepolicy.cil is moved to /vendor/etc/selinux, and
      * mapping_sepolicy.cil is moved to /vendor/etc/selinux.
      
      Test: Device boots, no additional denials. The test is performed both
            for a device without the CIL files and with the three CIL files.
      Bug: 31363362
      
      Change-Id: Ia760d7eb32c80ba72f6409da75d99eb5aae71cd9
      052b0bbb
  15. Feb 25, 2017
    • Alex Klyubin's avatar
      Test CIL policy when building it · 8f7173b0
      Alex Klyubin authored
      Prior to this commit, there was a bug in generated CIL where it
      wouldn't compile using secilc. The reason was that the build script
      was stripping out all lines containing "neverallow" from CIL files,
      accidentally removing lines which were not neverallow statements,
      such as lmx lines referencing app_neverallows.te.
      
      The commit fixes the build script's CIL neverallow filter to filter
      out only neverallow* statements, as originally intended. Moreover, to
      catch non-compiling CIL policy earlier in the future, this commit runs
      secilc on the policy at build time. In particular, it tests that
      platform policy compiles on its own and that nonplatform + platform +
      mappig policy compiles as well.
      
      Test: CIL policy builds and compiles on-device using secilc
      Bug: 31363362
      Change-Id: I769aeb3d8c913a5599f1a2195c69460ece7f6465
      8f7173b0
  16. Jan 31, 2017
    • Alex Klyubin's avatar
      Device-agnostic policy for vendor image · 5596172d
      Alex Klyubin authored
      Default HAL implementations are built from the platform tree and get
      placed into the vendor image. The SELinux rules needed for these HAL
      implementations to operate thus need to reside on the vendor
      partition.
      
      Up to now, the only place to define such rules in the source tree was
      the system/sepolicy/public directory. These rules are placed into the
      vendor partition. Unfortunately, they are also placed into the
      system/root partition, which thus unnecessarily grants these rules to
      all HAL implementations of the specified service, default/in-process
      shims or not.
      
      This commit adds a new directory, system/sepolicy/vendor, whose
      rules are concatenated with the device-specific rules at build time.
      These rules are thus placed into the vendor partition and are not
      placed into the system/root partition.
      
      Test: No change to SELinux policy.
      Test: Rules placed into vendor directory end up in nonplat* artefacts,
            but not in plat* artefacts.
      Bug: 34715716
      Change-Id: Iab14aa7a3311ed6d53afff673e5d112428941f1c
      5596172d
  17. Jan 29, 2017
  18. Jan 20, 2017
    • Alex Klyubin's avatar
      Fix bugs in *_file_contexts targets · e4665d7f
      Alex Klyubin authored
      This fixes the following issues introduced in commit
      d225b697:
      * plat_file_contexts was empty because the target was referencing
        system/sepolicy/private/file_contexts via a misspelled variable
        name.
      * plat_file_contexts wasn't marked as dirty and thus wasn't rebuilt
        when system/sepolicy/private/file_contexts changed. This is because
        the file_contexts dependency was referenced via a misspelled
        variable name.
      * plat_file_contexts wasn't sorted (as opposed to other similar
        targets, such as nonplat_file_contexts and file_contexts.bin). This
        may lead to unnecessary non-determinism.
      * nonplat_file_contexts wasn't marked dirty and thus wasn't rebuilt
        when device-specific file_contexts file(s) changed. This is because
        the file_contexts files were referenced via a misspelled variable
        name.
      
      Test: "make plat_file_contexts" produces a non-empty file containing
            mappings from system/sepolicy/private/file_contexts
      Test: "make plat_file_contexts" updates output when
            system/sepolicy/private/file_contexts changes
      Test: "make plat_file_contexts" produces output which is sorted
            accroding to rules in fc_sort
      Test: "make nonplat_file_contexts" updates output when
            device/lge/bullhead/sepolicy/file_contexts changes (tested on
            aosp_bullhead-eng)
      Bug: 31363362
      Change-Id: I540555651103f02c96cf958bb93618f600e47a75
      e4665d7f
  19. Jan 18, 2017
  20. Jan 09, 2017
  21. Jan 05, 2017
    • dcashman's avatar
      Split file_contexts for on-device compilation. · d225b697
      dcashman authored
      
      Simulate platform and non-platform split by compiling two different
      file_contexts files and loading them together on-device.  Leave the existing
      file_contexts.bin in place until we're ready to build images based on the new
      files.
      
      Bug: 31363362
      Test: Builds and boots without additional denials.
      Change-Id: I7248f876e2230cee3b3cbf386422063da1e3dde0
      
      Bring back file_contexts.bin.
      
      Change-Id: Ifec2c363579151080fdec48e8bc46bbbc8c97674
      Signed-off-by: default avatarSandeep Patil <sspatil@google.com>
      d225b697
  22. Dec 28, 2016
  23. Dec 21, 2016
    • Steven Moreland's avatar
      Remove ENABLE_TREBLE from sepolicy. · 52b75977
      Steven Moreland authored
      Enabling/disabling sepolicy based on ENABLE_TREBLE is not granular
      enough (ref: b/32978887 #4).
      
      Bug: 32978887
      Test: compiles, doesn't cause any additional denials on device. Nothing
      depends on these things I'm removing.
      Change-Id: I10acbde16e5e2093f2c9205ed79cd20caed7f44d
      52b75977
  24. Dec 17, 2016
  25. Dec 16, 2016
    • Dan Cashman's avatar
      Move sepolicy and recovery from on-device tree and add dependency. · cf5c6ecb
      Dan Cashman authored
      Prevent sepolicy and sepolicy.recover from showing up in the root
      filesystem when they will not be created as part of it.  Also make
      sure both are added as dependencies to version_policy to ensure the
      neverallow checks are run.
      
      Bug: 31363362
      Test: Builds and boots, including recovery, without additional
        denials.  Neverallow violations still caught at build time.
      
      Change-Id: I39e3cbc150551c9316952523927d057538cd00a7
      cf5c6ecb
    • Dan Cashman's avatar
      Switch recovery to versioned policy and split into components. · 1c040277
      Dan Cashman authored
      And do some clean up:
      Replace LOCAL_TARGET_ARCH with global arch specifier that won't get
      clobbered, clean up sepolicy.recovery's eng specification, ensure that
      build macros are applied across all policy generation, not just
      plat_policy, and make sure that all private variables are cleared and
      alphabetized at the end.
      
      Bug: 31363362
      Bug: 31369363
      Test: Boot into recovery and observe no selinux denials.
      Change-Id: Ibc15b097f6d19acf01f6b22bee0e083b15f4ef75
      1c040277
  26. Dec 15, 2016
  27. Dec 13, 2016
    • dcashman's avatar
      Split policy for on-device compilation. · 1faa644c
      dcashman authored
      Simulate platform and non-platform split by sending the split files to the
      device to be compiled by init.
      
      Bug: 31363362
      Test: Policy builds on-device and boots.  sediff shows no difference.
      Change-Id: I9627d1c66ca37786d97a049666278a4992ad7579
      1faa644c
  28. Dec 07, 2016
  29. Dec 06, 2016
    • dcashman's avatar
      sepolicy: add version_policy tool and version non-platform policy. · 2e00e637
      dcashman authored
      In order to support platform changes without simultaneous updates from
      non-platform components, the platform and non-platform policies must be
      split.  In order to provide a guarantee that policy written for
      non-platform objects continues to provide the same access, all types
      exposed to non-platform policy are versioned by converting them and the
      policy using them into attributes.
      
      This change performs that split, the subsequent versioning and also
      generates a mapping file to glue the different policy components
      together.
      
      Test: Device boots and runs.
      Bug: 31369363
      Change-Id: Ibfd3eb077bd9b8e2ff3b2e6a0ca87e44d78b1317
      2e00e637
Loading