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
This commit is contained in:
Treehugger Robot
2019-03-08 15:55:53 +00:00
committed by Gerrit Code Review
parent e5e3ac639b 12aaf7e2ef
commit a6f3476476
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() {
// TODO: check that the calling PID is the system server.
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);
}
}

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

@@ -289,7 +289,8 @@ public class NetworkStackClient {
private void requestConnector(@NonNull NetworkStackCallback request) {
// TODO: PID check.
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
throw new SecurityException(
"Only the system server should try to bind to the network stack.");