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

Merge "Revert "SELinux labels bug logging and workaround"" into tm-dev am: 1133947cd1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18699985

Change-Id: If5a025ef9f5b56a8e73747773a10652e0c8394b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Patrick Baumann
2022-06-02 15:47:49 +00:00
committed by Automerger Merge Worker
parent 305b401a14 1133947cd1
commit ecaa9ba814
3 changed files with 3 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/pm/FileInstallArgs.java
View File

@@ -172,22 +172,9 @@ class FileInstallArgs extends InstallArgs {
return false;
}
if (onIncremental) {
Slog.i(TAG, PackageManagerServiceUtils.SELINUX_BUG
+ ": Skipping restorecon for Incremental install of " + beforeCodeFile);
} else {
try {
if (!SELinux.restoreconRecursive(afterCodeFile)) {
Slog.w(TAG, "Failed to restorecon");
return false;
}
PackageManagerServiceUtils.verifySelinuxLabels(afterCodeFile.getAbsolutePath());
} catch (Exception e) {
Slog.e(TAG,
PackageManagerServiceUtils.SELINUX_BUG + ": Exception from restorecon on "
+ beforeCodeFile, e);
throw e;
}
if (!onIncremental && !SELinux.restoreconRecursive(afterCodeFile)) {
Slog.w(TAG, "Failed to restorecon");
return false;
}
// Reflect the rename internally

5
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -653,10 +653,6 @@ final class InstallPackageHelper {
Log.v(TAG, "restoreAndPostInstall userId=" + userId + " package=" + res.mPkg);
}
if (res.mPkg != null) {
PackageManagerServiceUtils.verifySelinuxLabels(res.mPkg.getPath());
}
// A restore should be requested at this point if (a) the install
// succeeded, (b) the operation is not an update.
final boolean update = res.mRemovedInfo != null
@@ -3580,7 +3576,6 @@ final class InstallPackageHelper {
@ParsingPackageUtils.ParseFlags int parseFlags,
@PackageManagerService.ScanFlags int scanFlags,
@Nullable UserHandle user) throws PackageManagerException {
PackageManagerServiceUtils.verifySelinuxLabels(parsedPackage.getPath());
final Pair<ScanResult, Boolean> scanResultPair = scanSystemPackageLI(
parsedPackage, parseFlags, scanFlags, user);

25
services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
View File

@@ -62,7 +62,6 @@ import android.os.Debug;
import android.os.Environment;
import android.os.FileUtils;
import android.os.Process;
import android.os.SELinux;
import android.os.SystemProperties;
import android.os.incremental.IncrementalManager;
import android.os.incremental.IncrementalStorage;
@@ -1403,28 +1402,4 @@ public class PackageManagerServiceUtils {
}
}
}
// TODO(b/231951809): remove this workaround after figuring out why apk_tmp_file labels stay
// on the installed apps instead of the correct apk_data_file ones
public static final String SELINUX_BUG = "b/231951809";
/**
* A workaround for b/231951809:
* Verifies the SELinux labels of the passed path, and tries to correct them if detects them
* wrong or missing.
*/
public static void verifySelinuxLabels(String path) {
final String expectedCon = SELinux.fileSelabelLookup(path);
final String actualCon = SELinux.getFileContext(path);
Slog.i(TAG, SELINUX_BUG + ": checking selinux labels for " + path + " expected / actual: "
+ expectedCon + " / " + actualCon);
if (expectedCon == null || !expectedCon.equals(actualCon)) {
Slog.w(TAG, SELINUX_BUG + ": labels don't match, reapplying for " + path);
if (!SELinux.restoreconRecursive(new File(path))) {
Slog.w(TAG, SELINUX_BUG + ": Failed to reapply restorecon");
}
// well, if it didn't work now after not working at first, not much else can be done
}
}
}