commit a1b2eaa2644843787c4ed8c2f62faa125b40d3f7
author Nick Kralevich <nnk@google.com> Mon Aug 10 19:48:39 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 10 19:48:39 2015 +0000
tree d6c2aa616a2ce826c051455b5ee65449f0b86a6f
parent 2bb9861d481b9a7e5e3001ebb9592f382d53b5e4
parent 7fd646708c4248b0ee2bb35176b58b298a7b8ae0

Merge "installd _delete_dir_contents: add O_NOFOLLOW"

cmds/installd/utils.cpp

diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index ba411cd..4fcb1f5 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -234,7 +234,7 @@
                 if ((name[1] == '.') && (name[2] == 0)) continue;
             }
 
-            subfd = openat(dfd, name, O_RDONLY | O_DIRECTORY);
+            subfd = openat(dfd, name, O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
             if (subfd < 0) {
                 ALOGE("Couldn't openat %s: %s\n", name, strerror(errno));
                 result = -1;