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

Commit 651112fb authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge "Always delete old idmap in createIdmap" into sc-dev

parents 9a473648 b49cb5ec

cmds/idmap2/idmap2d/Idmap2Service.cpp

+6 −4
Original line number Diff line number Diff line
@@ -161,6 +161,12 @@ Status Idmap2Service::createIdmap(const std::string& target_path, const std::str 
                                    idmap_path.c_str(), uid));

  }



  // idmap files are mapped with mmap in libandroidfw. Deleting and recreating the idmap guarantees

  // that existing memory maps will continue to be valid and unaffected. The file must be deleted

  // before attempting to create the idmap, so that if idmap  creation fails, the overlay will no

  // longer be usable.

  unlink(idmap_path.c_str());



  const auto target = GetTargetContainer(target_path);

  if (!target) {

    return error("failed to load target '%s'" + target_path);
@@ -177,10 +183,6 @@ Status Idmap2Service::createIdmap(const std::string& target_path, const std::str 
    return error(idmap.GetErrorMessage());

  }



  // idmap files are mapped with mmap in libandroidfw. Deleting and recreating the idmap guarantees

  // that existing memory maps will continue to be valid and unaffected.

  unlink(idmap_path.c_str());



  umask(kIdmapFilePermissionMask);

  std::ofstream fout(idmap_path);

  if (fout.fail()) {