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

Merge "Give Telephony the permissions to access the network stack."

Browse Source 
am: a6f3476476

Change-Id: I4ae09aac25226904e34d77edb7333da0aabe86f9
This commit is contained in:
Chalard Jean
2019-03-08 08:38:35 -08:00
committed by android-build-merger
parent b0498ba448 a6f3476476
commit 1dba2f82ad
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/NetworkStack/src/com/android/server/util/PermissionUtil.java
View File

@@ -33,7 +33,9 @@ public final class PermissionUtil {
public static void checkNetworkStackCallingPermission() { public static void checkNetworkStackCallingPermission() {
// TODO: check that the calling PID is the system server. // TODO: check that the calling PID is the system server.
final int caller = getCallingUid(); final int caller = getCallingUid();
if (caller != Process.SYSTEM_UID && UserHandle.getAppId(caller) != Process.BLUETOOTH_UID) { if (caller != Process.SYSTEM_UID
&& UserHandle.getAppId(caller) != Process.BLUETOOTH_UID
&& UserHandle.getAppId(caller) != Process.PHONE_UID) {
throw new SecurityException("Invalid caller: " + caller); throw new SecurityException("Invalid caller: " + caller);
} }
} }

3
services/net/java/android/net/NetworkStackClient.java
View File

@@ -289,7 +289,8 @@ public class NetworkStackClient {
private void requestConnector(@NonNull NetworkStackCallback request) { private void requestConnector(@NonNull NetworkStackCallback request) {
// TODO: PID check. // TODO: PID check.
final int caller = Binder.getCallingUid(); final int caller = Binder.getCallingUid();
if (caller != Process.SYSTEM_UID && !UserHandle.isSameApp(caller, Process.BLUETOOTH_UID)) { if (caller != Process.SYSTEM_UID && !UserHandle.isSameApp(caller, Process.BLUETOOTH_UID)
&& !UserHandle.isSameApp(caller, Process.PHONE_UID)) {
// Don't even attempt to obtain the connector and give a nice error message // Don't even attempt to obtain the connector and give a nice error message
throw new SecurityException( throw new SecurityException(
"Only the system server should try to bind to the network stack."); "Only the system server should try to bind to the network stack.");