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

Commit c45bad1d authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am a1b2eaa2: Merge "installd _delete_dir_contents: add O_NOFOLLOW" 

* commit 'a1b2eaa2':
  installd _delete_dir_contents: add O_NOFOLLOW
parents f3486868 a1b2eaa2

cmds/installd/utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static int _delete_dir_contents(DIR *d, 
                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;