WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core] Check loadedApk package name when getting manager binder (#687) 

Some OS, like MIUI, inject other loaded apk to manager and will
cause annoying warnings
This commit is contained in:
LoveSy 2021-05-27 22:15:59 +08:00 committed by GitHub
parent c18ec95ce4
commit de98686532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/aidl/org/lsposed/lspd/service/ILSPApplicationService.aidl
View File

@ -3,7 +3,7 @@ package org.lsposed.lspd.service;
interface ILSPApplicationService { interface ILSPApplicationService {
IBinder requestModuleBinder() = 2; IBinder requestModuleBinder() = 2;
IBinder requestManagerBinder() = 3; IBinder requestManagerBinder(String packageName) = 3;
boolean isResourcesHookEnabled() = 5; boolean isResourcesHookEnabled() = 5;

4
core/src/main/java/org/lsposed/lspd/config/LSPApplicationServiceClient.java
View File

@ -69,9 +69,9 @@ public class LSPApplicationServiceClient implements ILSPApplicationService {
} }
@Override @Override
public IBinder requestManagerBinder() { public IBinder requestManagerBinder(String packageName) {
try { try {
return service.requestManagerBinder(); return service.requestManagerBinder(packageName);
} catch (RemoteException | NullPointerException ignored) { } catch (RemoteException | NullPointerException ignored) {
} }
return null; return null;

3
core/src/main/java/org/lsposed/lspd/core/Main.java
View File

@ -28,6 +28,7 @@ import android.content.pm.ApplicationInfo;
import android.content.res.CompatibilityInfo; import android.content.res.CompatibilityInfo;
import android.os.Environment; import android.os.Environment;
import android.os.IBinder; import android.os.IBinder;
import android.os.Process;
import org.lsposed.lspd.config.LSPApplicationServiceClient; import org.lsposed.lspd.config.LSPApplicationServiceClient;
import org.lsposed.lspd.deopt.PrebuiltMethodsDeopter; import org.lsposed.lspd.deopt.PrebuiltMethodsDeopter;
@ -102,7 +103,7 @@ public class Main {
XposedInit.startsSystemServer = isSystem; XposedInit.startsSystemServer = isSystem;
PrebuiltMethodsDeopter.deoptBootMethods(); // do it once for secondary zygote PrebuiltMethodsDeopter.deoptBootMethods(); // do it once for secondary zygote
installBootstrapHooks(isSystem, appDataDir); installBootstrapHooks(isSystem, appDataDir);
Utils.logI("Loading modules for " + niceName); Utils.logI("Loading modules for " + niceName + "/" + Process.myUid());
loadModulesSafely(); loadModulesSafely();
} }

2
core/src/main/java/org/lsposed/lspd/hooker/LoadedApkGetCLHooker.java
View File

@ -78,7 +78,7 @@ public class LoadedApkGetCLHooker extends XC_MethodHook {
lpparam.appInfo = loadedApk.getApplicationInfo(); lpparam.appInfo = loadedApk.getApplicationInfo();
lpparam.isFirstApplication = this.isFirstApplication; lpparam.isFirstApplication = this.isFirstApplication;
IBinder binder = serviceClient.requestManagerBinder(); IBinder binder = loadedApk.getApplicationInfo() != null ? serviceClient.requestManagerBinder(loadedApk.getApplicationInfo().packageName) : null;
if (binder != null) { if (binder != null) {
if (InstallerVerifier.verifyInstallerSignature(loadedApk.getApplicationInfo())) { if (InstallerVerifier.verifyInstallerSignature(loadedApk.getApplicationInfo())) {
XposedInstallerHooker.hookXposedInstaller(lpparam.classLoader, binder); XposedInstallerHooker.hookXposedInstaller(lpparam.classLoader, binder);

4
core/src/main/java/org/lsposed/lspd/service/LSPApplicationService.java
View File

@ -101,9 +101,9 @@ public class LSPApplicationService extends ILSPApplicationService.Stub {
} }
@Override @Override
public IBinder requestManagerBinder() throws RemoteException { public IBinder requestManagerBinder(String packageName) throws RemoteException {
ensureRegistered(); ensureRegistered();
if (ConfigManager.getInstance().isManager(getCallingUid())) { if (ConfigManager.getInstance().isManager(getCallingUid()) && ConfigManager.getInstance().isManager(packageName)) {
var service = ServiceManager.getManagerService(); var service = ServiceManager.getManagerService();
if (Utils.isMIUI) { if (Utils.isMIUI) {
service.new ManagerGuard(handles.get(getCallingPid())); service.new ManagerGuard(handles.get(getCallingPid()));