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

Commit 0cd72a9b authored by Artem Yudin's avatar Artem Yudin
Browse files

Fix logical bugs around access() POSIX call 

According to docs of access():
If the specified access is permitted, access() returns 0.
If the given file cannot be accessed in the specified way, access() returns -1

See my comment: https://android-review.googlesource.com/c/platform/bootable/recovery/+/883392/comments/e9b76d97_f4cab88d

Test: builds
Bug: 234887937
Change-Id: I5712d61e967566246603f23a62e2c7b708130b0d
parent 94bb8a80

recovery-persist.cpp

+14 −10
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ static void copy_file(const char* source, const char* destination) { 
  }

}



static bool file_exists(const char* filename) {

  return access(filename, R_OK) == 0;

}



static bool rotated = false;



ssize_t logsave(
@@ -141,7 +145,7 @@ int main(int argc, char **argv) { 
    if (has_cache) {

      // Collects and reports the non-a/b update metrics from last_install; and removes the file

      // to avoid duplicate report.

      if (access(LAST_INSTALL_FILE_IN_CACHE, F_OK) && unlink(LAST_INSTALL_FILE_IN_CACHE) == -1) {

      if (file_exists(LAST_INSTALL_FILE_IN_CACHE) && unlink(LAST_INSTALL_FILE_IN_CACHE) == -1) {

        PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE_IN_CACHE;

      }
@@ -152,8 +156,8 @@ int main(int argc, char **argv) { 
      }

    }



    /* Is there something in pmsg? */

    if (access(LAST_PMSG_FILE, R_OK)) {

    /* Is there something in pmsg? If not, no need to proceed. */

    if (!file_exists(LAST_PMSG_FILE)) {

      return 0;

    }
@@ -164,16 +168,16 @@ int main(int argc, char **argv) { 
    // For those device without /cache, the last_install file has been copied to

    // /data/misc/recovery from pmsg. Looks for the sideload history only.

    if (!has_cache) {

      if (access(LAST_INSTALL_FILE, F_OK) && unlink(LAST_INSTALL_FILE) == -1) {

      if (file_exists(LAST_INSTALL_FILE) && unlink(LAST_INSTALL_FILE) == -1) {

        PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE;

      }

    }



    /* Is there a last console log too? */

    if (rotated) {

        if (!access(LAST_CONSOLE_FILE, R_OK)) {

      if (file_exists(LAST_CONSOLE_FILE)) {

        copy_file(LAST_CONSOLE_FILE, LAST_KMSG_FILE);

        } else if (!access(ALT_LAST_CONSOLE_FILE, R_OK)) {

      } else if (file_exists(ALT_LAST_CONSOLE_FILE)) {

        copy_file(ALT_LAST_CONSOLE_FILE, LAST_KMSG_FILE);

      }

    }