From a71faae86f3ff23c4400f0b1d0452b2d6d7fbe10 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 14 Jul 2023 08:57:30 -0700 Subject: [PATCH 1/2] Allow processes in the "system" group to read /metadata/ota. lpdumpd runs as "system", not "root". Adjust the DAC permissions of /metadata/ota so it can call SnapshotManager::Dump. Bug: 291083311 Test: lpdump Change-Id: I97fd7eb2055cf6d31fd42f1021e2f99edbdb838a --- rootdir/init.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 4f3959f7c..be03489a6 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -604,8 +604,8 @@ on post-fs chmod 0700 /metadata/vold mkdir /metadata/password_slots 0771 root system mkdir /metadata/bootstat 0750 system log - mkdir /metadata/ota 0700 root system - mkdir /metadata/ota/snapshots 0700 root system + mkdir /metadata/ota 0750 root system + mkdir /metadata/ota/snapshots 0750 root system mkdir /metadata/userspacereboot 0770 root system mkdir /metadata/watchdog 0770 root system From 07339000d4e9d12c2f29d062c0e71395cde4ea1a Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 14 Jul 2023 12:30:35 -0700 Subject: [PATCH 2/2] Remove local_include_dirs from fs_mgr_defaults. fs_mgr_defaults gets used in lots of places, propagate local_include_dirs to where it's needed so it doesn't cause problems on modules that don't have an "includes" directory. Bug: 291083311 Test: builds Change-Id: Ief2f6362f584b99d3e2dc7dc1b46450609ad189d --- fs_mgr/Android.bp | 3 ++- fs_mgr/libsnapshot/snapuserd/Android.bp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp index 15600fd40..0a836e432 100644 --- a/fs_mgr/Android.bp +++ b/fs_mgr/Android.bp @@ -49,7 +49,6 @@ cc_defaults { sanitize: { misc_undefined: ["integer"], }, - local_include_dirs: ["include/"], cflags: [ "-Wall", "-Werror", @@ -60,6 +59,7 @@ cc_defaults { name: "libfs_mgr_defaults", defaults: ["fs_mgr_defaults"], export_include_dirs: ["include"], + local_include_dirs: ["include/"], include_dirs: ["system/vold"], cflags: [ "-D_FILE_OFFSET_BITS=64", @@ -188,6 +188,7 @@ cc_library_static { ], host_supported: true, defaults: ["fs_mgr_defaults"], + local_include_dirs: ["include/"], srcs: [ "fs_mgr_fstab.cpp", "fs_mgr_boot_config.cpp", diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp index 9fe567acb..e5b561b68 100644 --- a/fs_mgr/libsnapshot/snapuserd/Android.bp +++ b/fs_mgr/libsnapshot/snapuserd/Android.bp @@ -57,6 +57,7 @@ cc_library_static { defaults: [ "fs_mgr_defaults", ], + local_include_dirs: ["include/"], srcs: [ "dm-snapshot-merge/snapuserd.cpp", "dm-snapshot-merge/snapuserd_worker.cpp",