Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fde19425 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate 

(cherry picked from commit f0b53d07)
(added "system/vendor/bin/hostapd" to list)

Cover both direct and symlink indirect paths to the referenced
files in the vendor, odm and oem partitions.

Test: compile and hand-verify properties
Bug: 37703469
Change-Id: I5b3a887e904baee2ac193ac4a73aaaee0bbfdb9f
parent 6399d457

libcutils/fs_config.c

+19 −0
Original line number Diff line number Diff line
@@ -140,8 +140,14 @@ static const struct fs_path_config android_files[] = { 
    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/default.prop" },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_dir + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_file + 1 },

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/odm/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/odm/default.prop" },

    { 00444, AID_ROOT,      AID_ROOT,      0, "system/odm/etc/fs_config_dirs" },

    { 00444, AID_ROOT,      AID_ROOT,      0, "system/odm/etc/fs_config_files" },

    { 00444, AID_ROOT,      AID_ROOT,      0, oem_conf_dir + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, oem_conf_file + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, "system/oem/etc/fs_config_dirs" },

    { 00444, AID_ROOT,      AID_ROOT,      0, "system/oem/etc/fs_config_files" },

    { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/fs_mgr" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump32" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump64" },
@@ -158,6 +164,10 @@ static const struct fs_path_config android_files[] = { 
    { 00555, AID_ROOT,      AID_ROOT,      0, "system/etc/ppp/*" },

    { 00555, AID_ROOT,      AID_ROOT,      0, "system/etc/rc.*" },

    { 00440, AID_ROOT,      AID_ROOT,      0, "system/etc/recovery.img" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/vendor/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/vendor/default.prop" },

    { 00444, AID_ROOT,      AID_ROOT,      0, "system/vendor/etc/fs_config_dirs" },

    { 00444, AID_ROOT,      AID_ROOT,      0, "system/vendor/etc/fs_config_files" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "vendor/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "vendor/default.prop" },

    { 00444, AID_ROOT,      AID_ROOT,      0, ven_conf_dir + 1 },
@@ -185,17 +195,26 @@ static const struct fs_path_config android_files[] = { 
                                              "system/bin/surfaceflinger" },



    /* Support hostapd administering a network interface. */

    { 00755, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |

                                           CAP_MASK_LONG(CAP_NET_RAW),

                                              "system/vendor/bin/hostapd" },

    { 00755, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |

                                           CAP_MASK_LONG(CAP_NET_RAW),

                                              "vendor/bin/hostapd" },



    /* Support Bluetooth legacy hal accessing /sys/class/rfkill

     * Support RT scheduling in Bluetooth */

    { 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) |

                                           CAP_MASK_LONG(CAP_SYS_NICE),

                                              "system/vendor/bin/hw/android.hardware.bluetooth@1.0-service" },

    { 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) |

                                           CAP_MASK_LONG(CAP_SYS_NICE),

                                              "vendor/bin/hw/android.hardware.bluetooth@1.0-service" },



    /* Support wifi_hal_legacy administering a network interface. */

    { 00755, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |

                                           CAP_MASK_LONG(CAP_NET_RAW),

                                              "system/vendor/bin/hw/android.hardware.wifi@1.0-service" },

    { 00755, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |

                                           CAP_MASK_LONG(CAP_NET_RAW),

                                              "vendor/bin/hw/android.hardware.wifi@1.0-service" },