Skip children in fixupAppData() when parent shady.
If we find a directory with a shady GID, skip traversing into child
directories (if any), since we'll probably end up spamming the log
with every single item inside.
(cherry picked from commit 6b63b91febc595ff67ef45b3c4bd56c8268899e9)
Test: builds, boots
Bug: 65852352
Merged-In: I8f03864adef572fc277e34e9f1589d9664fc75b3
Change-Id: I8f03864adef572fc277e34e9f1589d9664fc75b3
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 4a93b1f..7a397d1 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -714,6 +714,9 @@
// Ignore all other GID transitions, since they're kinda shady
LOG(WARNING) << "Ignoring " << p->fts_path << " with unexpected GID " << actual
<< " instead of " << expected;
+ if (!(flags & FLAG_FORCE)) {
+ fts_set(fts, p, FTS_SKIP);
+ }
}
}
}