Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to unlink session file if hardlink fails

Browse Source 
If either creating the link or changing the file permissions fails, the session
should clean up the link so that a fallback manual copy can succeed. This can occur
during APEX rollback.

Bug: 274802935

Test: manual, follow steps in bug to test rollback mechanism

Change-Id: Ic15bbe657a11a26b4bbcc48dca2f3e3a3f1239e2
This commit is contained in:
Winson Chiu
2023-05-01 23:04:27 +00:00
parent 45d3fa60f2
commit dd7ffddb26
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -1633,13 +1633,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
throw new SecurityException("link() can only be run by the system");
}
final File target = new File(path);
final File source = new File(stageDir, target.getName());
var sourcePath = source.getAbsolutePath();
try {
final File target = new File(path);
final File source = new File(stageDir, target.getName());
try {
Os.link(path, source.getAbsolutePath());
Os.link(path, sourcePath);
// Grant READ access for APK to be read successfully
Os.chmod(source.getAbsolutePath(), 0644);
Os.chmod(sourcePath, 0644);
} catch (ErrnoException e) {
e.rethrowAsIOException();
}
@@ -1647,6 +1648,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
throw new IOException("Can't relabel file: " + source);
}
} catch (IOException e) {
try {
Os.unlink(sourcePath);
} catch (Exception ignored) {
Slog.d(TAG, "Failed to unlink session file: " + sourcePath);
}
throw ExceptionUtils.wrap(e);
}
}