From c6742dbbf95cc899c597d698801426a5d3d34ae2 Mon Sep 17 00:00:00 2001 From: Anton Hansson <hansson@google.com> Date: Wed, 24 Oct 2018 14:50:22 +0100 Subject: [PATCH] Properly escape dots in file_contexts filenames I found these with the regex (?<!\\)\.(?!\*|\+) Test: make Change-Id: I1c2e817d164b1074cb359cdb6d46bcf71e220765 --- private/file_contexts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/private/file_contexts b/private/file_contexts index ee295caa6..ecab5a27b 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -246,7 +246,7 @@ /system/bin/recovery-refresh u:object_r:recovery_refresh_exec:s0 /system/bin/sdcard u:object_r:sdcardd_exec:s0 /system/bin/dhcpcd u:object_r:dhcp_exec:s0 -/system/bin/dhcpcd-6.8.2 u:object_r:dhcp_exec:s0 +/system/bin/dhcpcd-6\.8\.2 u:object_r:dhcp_exec:s0 /system/bin/mtpd u:object_r:mtp_exec:s0 /system/bin/pppd u:object_r:ppp_exec:s0 /system/bin/racoon u:object_r:racoon_exec:s0 @@ -269,10 +269,10 @@ /system/bin/update_verifier u:object_r:update_verifier_exec:s0 /system/bin/logwrapper u:object_r:system_file:s0 /system/bin/vdc u:object_r:vdc_exec:s0 -/system/bin/cppreopts.sh u:object_r:cppreopts_exec:s0 -/system/bin/preloads_copy.sh u:object_r:preloads_copy_exec:s0 +/system/bin/cppreopts\.sh u:object_r:cppreopts_exec:s0 +/system/bin/preloads_copy\.sh u:object_r:preloads_copy_exec:s0 /system/bin/preopt2cachename u:object_r:preopt2cachename_exec:s0 -/system/bin/install-recovery.sh u:object_r:install_recovery_exec:s0 +/system/bin/install-recovery\.sh u:object_r:install_recovery_exec:s0 /system/bin/dex2oat(d)? u:object_r:dex2oat_exec:s0 /system/bin/dexoptanalyzer(d)? u:object_r:dexoptanalyzer_exec:s0 # patchoat executable has (essentially) the same requirements as dex2oat. @@ -302,7 +302,7 @@ /system/etc/selinux/plat_hwservice_contexts u:object_r:hwservice_contexts_file:s0 /system/etc/selinux/plat_file_contexts u:object_r:file_contexts_file:s0 /system/etc/selinux/plat_seapp_contexts u:object_r:seapp_contexts_file:s0 -/system/etc/selinux/plat_sepolicy.cil u:object_r:sepolicy_file:s0 +/system/etc/selinux/plat_sepolicy\.cil u:object_r:sepolicy_file:s0 /system/etc/selinux/plat_and_mapping_sepolicy\.cil\.sha256 u:object_r:sepolicy_file:s0 /system/usr/share/zoneinfo(/.*)? u:object_r:system_zoneinfo_file:s0 /system/bin/vr_hwc u:object_r:vr_hwc_exec:s0 @@ -328,8 +328,8 @@ /(vendor|system/vendor)/lib(64)?/vndk-sp(/.*)? u:object_r:vndk_sp_file:s0 -/(vendor|system/vendor)/manifest.xml u:object_r:vendor_configs_file:s0 -/(vendor|system/vendor)/compatibility_matrix.xml u:object_r:vendor_configs_file:s0 +/(vendor|system/vendor)/manifest\.xml u:object_r:vendor_configs_file:s0 +/(vendor|system/vendor)/compatibility_matrix\.xml u:object_r:vendor_configs_file:s0 /(vendor|system/vendor)/etc/vintf(/.*)? u:object_r:vendor_configs_file:s0 /(vendor|system/vendor)/app(/.*)? u:object_r:vendor_app_file:s0 /(vendor|system/vendor)/priv-app(/.*)? u:object_r:vendor_app_file:s0 @@ -354,9 +354,9 @@ /(odm|vendor/odm)/framework(/.*)? u:object_r:vendor_framework_file:s0 # Input configuration -/(odm|vendor|vendor/odm)/usr/keylayout(/.*)?.kl u:object_r:vendor_keylayout_file:s0 -/(odm|vendor|vendor/odm)/usr/keychars(/.*)?.kcm u:object_r:vendor_keychars_file:s0 -/(odm|vendor|vendor/odm)/usr/idc(/.*)?.idc u:object_r:vendor_idc_file:s0 +/(odm|vendor|vendor/odm)/usr/keylayout(/.*)?\.kl u:object_r:vendor_keylayout_file:s0 +/(odm|vendor|vendor/odm)/usr/keychars(/.*)?\.kcm u:object_r:vendor_keychars_file:s0 +/(odm|vendor|vendor/odm)/usr/idc(/.*)?\.idc u:object_r:vendor_idc_file:s0 /oem(/.*)? u:object_r:oemfs:s0 @@ -365,12 +365,12 @@ /odm/etc/selinux/precompiled_sepolicy u:object_r:sepolicy_file:s0 /odm/etc/selinux/precompiled_sepolicy\.plat_and_mapping\.sha256 u:object_r:sepolicy_file:s0 -/(odm|vendor/odm)/etc/selinux/odm_sepolicy.cil u:object_r:sepolicy_file:s0 +/(odm|vendor/odm)/etc/selinux/odm_sepolicy\.cil u:object_r:sepolicy_file:s0 /(odm|vendor/odm)/etc/selinux/odm_file_contexts u:object_r:file_contexts_file:s0 /(odm|vendor/odm)/etc/selinux/odm_seapp_contexts u:object_r:seapp_contexts_file:s0 /(odm|vendor/odm)/etc/selinux/odm_property_contexts u:object_r:property_contexts_file:s0 /(odm|vendor/odm)/etc/selinux/odm_hwservice_contexts u:object_r:hwservice_contexts_file:s0 -/(odm|vendor/odm)/etc/selinux/odm_mac_permissions.xml u:object_r:mac_perms_file:s0 +/(odm|vendor/odm)/etc/selinux/odm_mac_permissions\.xml u:object_r:mac_perms_file:s0 ############################# # Product files @@ -438,7 +438,7 @@ /data/misc/camera(/.*)? u:object_r:camera_data_file:s0 /data/misc/carrierid(/.*)? u:object_r:radio_data_file:s0 /data/misc/dhcp(/.*)? u:object_r:dhcp_data_file:s0 -/data/misc/dhcp-6.8.2(/.*)? u:object_r:dhcp_data_file:s0 +/data/misc/dhcp-6\.8\.2(/.*)? u:object_r:dhcp_data_file:s0 /data/misc/gatekeeper(/.*)? u:object_r:gatekeeper_data_file:s0 /data/misc/incidents(/.*)? u:object_r:incident_data_file:s0 /data/misc/keychain(/.*)? u:object_r:keychain_data_file:s0 @@ -522,7 +522,7 @@ /data/system_ce/[0-9]+/shortcut_service/bitmaps(/.*)? u:object_r:shortcut_manager_icons:s0 # User icon files -/data/system/users/[0-9]+/photo.png u:object_r:icon_file:s0 +/data/system/users/[0-9]+/photo\.png u:object_r:icon_file:s0 # vold per-user data /data/misc_de/[0-9]+/vold(/.*)? u:object_r:vold_data_file:s0 -- GitLab