Merge "Revert "Add calling package verification for ATM binder calls"" into qt-r1-dev (4c580862) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityStackSupervisor.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1202,8 +1202,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
	final PackageInfo packageInfo;		final PackageInfo packageInfo;
	try {		try {
	packageInfo = mService.mContext.getPackageManager()		packageInfo = mService.mContext.getPackageManager()
	.getPackageInfoAsUser(callingPackage, PackageManager.GET_PERMISSIONS,		.getPackageInfo(callingPackage, PackageManager.GET_PERMISSIONS);
	UserHandle.getUserId(callingUid));
	} catch (PackageManager.NameNotFoundException e) {		} catch (PackageManager.NameNotFoundException e) {
	Slog.i(TAG, "Cannot find package info for " + callingPackage);		Slog.i(TAG, "Cannot find package info for " + callingPackage);
	return ACTIVITY_RESTRICTION_NONE;		return ACTIVITY_RESTRICTION_NONE;

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+9 −28

Original line number	Original line	Diff line number	Diff line
	@@ -1015,7 +1015,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	public final int startActivities(IApplicationThread caller, String callingPackage,		public final int startActivities(IApplicationThread caller, String callingPackage,
	Intent[] intents, String[] resolvedTypes, IBinder resultTo, Bundle bOptions,		Intent[] intents, String[] resolvedTypes, IBinder resultTo, Bundle bOptions,
	int userId) {		int userId) {
	assertPackageMatchesCallingUid(callingPackage);
	final String reason = "startActivities";		final String reason = "startActivities";
	enforceNotIsolatedCaller(reason);		enforceNotIsolatedCaller(reason);
	userId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId, reason);		userId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId, reason);
	@@ -1035,11 +1034,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	true /validateIncomingUser/);		true /validateIncomingUser/);
	}		}

	private int startActivityAsUser(IApplicationThread caller, String callingPackage,		int startActivityAsUser(IApplicationThread caller, String callingPackage,
	Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,		Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
	int startFlags, ProfilerInfo profilerInfo, Bundle bOptions, int userId,		int startFlags, ProfilerInfo profilerInfo, Bundle bOptions, int userId,
	boolean validateIncomingUser) {		boolean validateIncomingUser) {
	assertPackageMatchesCallingUid(callingPackage);
	enforceNotIsolatedCaller("startActivityAsUser");		enforceNotIsolatedCaller("startActivityAsUser");

	userId = getActivityStartController().checkTargetUser(userId, validateIncomingUser,		userId = getActivityStartController().checkTargetUser(userId, validateIncomingUser,
	@@ -1212,7 +1210,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	public final WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,		public final WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,
	Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,		Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
	int startFlags, ProfilerInfo profilerInfo, Bundle bOptions, int userId) {		int startFlags, ProfilerInfo profilerInfo, Bundle bOptions, int userId) {
	assertPackageMatchesCallingUid(callingPackage);
	final WaitResult res = new WaitResult();		final WaitResult res = new WaitResult();
	synchronized (mGlobalLock) {		synchronized (mGlobalLock) {
	enforceNotIsolatedCaller("startActivityAndWait");		enforceNotIsolatedCaller("startActivityAndWait");
	@@ -1240,7 +1237,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	public final int startActivityWithConfig(IApplicationThread caller, String callingPackage,		public final int startActivityWithConfig(IApplicationThread caller, String callingPackage,
	Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,		Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
	int startFlags, Configuration config, Bundle bOptions, int userId) {		int startFlags, Configuration config, Bundle bOptions, int userId) {
	assertPackageMatchesCallingUid(callingPackage);
	synchronized (mGlobalLock) {		synchronized (mGlobalLock) {
	enforceNotIsolatedCaller("startActivityWithConfig");		enforceNotIsolatedCaller("startActivityWithConfig");
	userId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId,		userId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId,
	@@ -1290,7 +1286,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,		Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
	int startFlags, ProfilerInfo profilerInfo, Bundle bOptions, IBinder permissionToken,		int startFlags, ProfilerInfo profilerInfo, Bundle bOptions, IBinder permissionToken,
	boolean ignoreTargetSecurity, int userId) {		boolean ignoreTargetSecurity, int userId) {
	assertPackageMatchesCallingUid(callingPackage);
	// This is very dangerous -- it allows you to perform a start activity (including		// This is very dangerous -- it allows you to perform a start activity (including
	// permission grants) as any app that may launch one of your own activities. So we only		// permission grants) as any app that may launch one of your own activities. So we only
	// allow this in two cases:		// allow this in two cases:
	@@ -1420,7 +1415,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	Intent intent, String resolvedType, IVoiceInteractionSession session,		Intent intent, String resolvedType, IVoiceInteractionSession session,
	IVoiceInteractor interactor, int startFlags, ProfilerInfo profilerInfo,		IVoiceInteractor interactor, int startFlags, ProfilerInfo profilerInfo,
	Bundle bOptions, int userId) {		Bundle bOptions, int userId) {
	assertPackageMatchesCallingUid(callingPackage);
	mAmInternal.enforceCallingPermission(BIND_VOICE_INTERACTION, "startVoiceActivity()");		mAmInternal.enforceCallingPermission(BIND_VOICE_INTERACTION, "startVoiceActivity()");
	if (session == null \|\| interactor == null) {		if (session == null \|\| interactor == null) {
	throw new NullPointerException("null session or interactor");		throw new NullPointerException("null session or interactor");
	@@ -1444,7 +1438,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	@Override		@Override
	public int startAssistantActivity(String callingPackage, int callingPid, int callingUid,		public int startAssistantActivity(String callingPackage, int callingPid, int callingUid,
	Intent intent, String resolvedType, Bundle bOptions, int userId) {		Intent intent, String resolvedType, Bundle bOptions, int userId) {
	assertPackageMatchesCallingUid(callingPackage);
	mAmInternal.enforceCallingPermission(BIND_VOICE_INTERACTION, "startAssistantActivity()");		mAmInternal.enforceCallingPermission(BIND_VOICE_INTERACTION, "startAssistantActivity()");
	userId = handleIncomingUser(callingPid, callingUid, userId, "startAssistantActivity");		userId = handleIncomingUser(callingPid, callingUid, userId, "startAssistantActivity");

	@@ -2370,9 +2363,15 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	void moveTaskToFrontLocked(@Nullable IApplicationThread appThread,		void moveTaskToFrontLocked(@Nullable IApplicationThread appThread,
	@Nullable String callingPackage, int taskId, int flags, SafeActivityOptions options,		@Nullable String callingPackage, int taskId, int flags, SafeActivityOptions options,
	boolean fromRecents) {		boolean fromRecents) {

	final int callingPid = Binder.getCallingPid();		final int callingPid = Binder.getCallingPid();
	final int callingUid = Binder.getCallingUid();		final int callingUid = Binder.getCallingUid();
	assertPackageMatchesCallingUid(callingPackage);		if (!isSameApp(callingUid, callingPackage)) {
			String msg = "Permission Denial: moveTaskToFrontLocked() from pid="
			+ Binder.getCallingPid() + " as package " + callingPackage;
			Slog.w(TAG, msg);
			throw new SecurityException(msg);
			}
	if (!checkAppSwitchAllowedLocked(callingPid, callingUid, -1, -1, "Task to front")) {		if (!checkAppSwitchAllowedLocked(callingPid, callingUid, -1, -1, "Task to front")) {
	SafeActivityOptions.abort(options);		SafeActivityOptions.abort(options);
	return;		return;
	@@ -2424,7 +2423,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	/**		/**
	* Return true if callingUid is system, or packageName belongs to that callingUid.		* Return true if callingUid is system, or packageName belongs to that callingUid.
	*/		*/
	private boolean isSameApp(int callingUid, @Nullable String packageName) {		boolean isSameApp(int callingUid, @Nullable String packageName) {
	try {		try {
	if (callingUid != 0 && callingUid != SYSTEM_UID) {		if (callingUid != 0 && callingUid != SYSTEM_UID) {
	if (packageName == null) {		if (packageName == null) {
	@@ -2441,21 +2440,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	return true;		return true;
	}		}

	/**
	* Checks that the provided package name matches the current calling UID, throws a security
	* exception if it doesn't.
	*/
	void assertPackageMatchesCallingUid(@Nullable String packageName) {
	final int callingUid = Binder.getCallingUid();
	if (isSameApp(callingUid, packageName)) {
	return;
	}
	final String msg = "Permission Denial: package=" + packageName
	+ " does not belong to uid=" + callingUid;
	Slog.w(TAG, msg);
	throw new SecurityException(msg);
	}

	boolean checkAppSwitchAllowedLocked(int sourcePid, int sourceUid,		boolean checkAppSwitchAllowedLocked(int sourcePid, int sourceUid,
	int callingPid, int callingUid, String name) {		int callingPid, int callingUid, String name) {
	if (mAppSwitchesAllowedTime < SystemClock.uptimeMillis()) {		if (mAppSwitchesAllowedTime < SystemClock.uptimeMillis()) {
	@@ -2989,7 +2973,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	@Override		@Override
	public List<IBinder> getAppTasks(String callingPackage) {		public List<IBinder> getAppTasks(String callingPackage) {
	int callingUid = Binder.getCallingUid();		int callingUid = Binder.getCallingUid();
	assertPackageMatchesCallingUid(callingPackage);
	long ident = Binder.clearCallingIdentity();		long ident = Binder.clearCallingIdentity();
	try {		try {
	synchronized (mGlobalLock) {		synchronized (mGlobalLock) {
	@@ -6214,7 +6197,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	SafeActivityOptions options, int userId, boolean validateIncomingUser,		SafeActivityOptions options, int userId, boolean validateIncomingUser,
	PendingIntentRecord originatingPendingIntent,		PendingIntentRecord originatingPendingIntent,
	boolean allowBackgroundActivityStart) {		boolean allowBackgroundActivityStart) {
	assertPackageMatchesCallingUid(callingPackage);
	synchronized (mGlobalLock) {		synchronized (mGlobalLock) {
	return getActivityStartController().startActivitiesInPackage(uid, realCallingPid,		return getActivityStartController().startActivitiesInPackage(uid, realCallingPid,
	realCallingUid, callingPackage, intents, resolvedTypes, resultTo, options,		realCallingUid, callingPackage, intents, resolvedTypes, resultTo, options,
	@@ -6230,7 +6212,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	int userId, TaskRecord inTask, String reason, boolean validateIncomingUser,		int userId, TaskRecord inTask, String reason, boolean validateIncomingUser,
	PendingIntentRecord originatingPendingIntent,		PendingIntentRecord originatingPendingIntent,
	boolean allowBackgroundActivityStart) {		boolean allowBackgroundActivityStart) {
	assertPackageMatchesCallingUid(callingPackage);
	synchronized (mGlobalLock) {		synchronized (mGlobalLock) {
	return getActivityStartController().startActivityInPackage(uid, realCallingPid,		return getActivityStartController().startActivityInPackage(uid, realCallingPid,
	realCallingUid, callingPackage, intent, resolvedType, resultTo, resultWho,		realCallingUid, callingPackage, intent, resolvedType, resultTo, resultWho,

services/core/java/com/android/server/wm/AppTaskImpl.java

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@ import android.os.Binder;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.UserHandle;		import android.os.UserHandle;
			import android.util.Slog;

	/**		/**
	* An implementation of IAppTask, that allows an app to manage its own tasks via		* An implementation of IAppTask, that allows an app to manage its own tasks via
	@@ -96,7 +97,12 @@ class AppTaskImpl extends IAppTask.Stub {
	// Will bring task to front if it already has a root activity.		// Will bring task to front if it already has a root activity.
	final int callingPid = Binder.getCallingPid();		final int callingPid = Binder.getCallingPid();
	final int callingUid = Binder.getCallingUid();		final int callingUid = Binder.getCallingUid();
	mService.assertPackageMatchesCallingUid(callingPackage);		if (!mService.isSameApp(callingUid, callingPackage)) {
			String msg = "Permission Denial: moveToFront() from pid="
			+ Binder.getCallingPid() + " as package " + callingPackage;
			Slog.w(TAG, msg);
			throw new SecurityException(msg);
			}
	final long origId = Binder.clearCallingIdentity();		final long origId = Binder.clearCallingIdentity();
	try {		try {
	synchronized (mService.mGlobalLock) {		synchronized (mService.mGlobalLock) {
	@@ -128,7 +134,6 @@ class AppTaskImpl extends IAppTask.Stub {
	public int startActivity(IBinder whoThread, String callingPackage,		public int startActivity(IBinder whoThread, String callingPackage,
	Intent intent, String resolvedType, Bundle bOptions) {		Intent intent, String resolvedType, Bundle bOptions) {
	checkCaller();		checkCaller();
	mService.assertPackageMatchesCallingUid(callingPackage);

	int callingUser = UserHandle.getCallingUserId();		int callingUser = UserHandle.getCallingUserId();
	TaskRecord tr;		TaskRecord tr;