commit 29fa7d2ffc3bba55173969309e280328b43eeca1
author dcashman <dcashman@google.com> Wed Sep 09 11:59:04 2015 -0700
committer dcashman <dcashman@google.com> Wed Sep 09 12:01:35 2015 -0700
tree b54a928063c7591db489e57cef92c829fe4fc09f
parent 0553024a5d7ca6593f61335ead1bade23d3d2e40

Add DUMP permission check to WifiScanner service.

Bug: 23936840
Change-Id: Ia1853db65bf277ed096c1385097bab2e5f76922d

service/java/com/android/server/wifi/WifiScanningServiceImpl.java

diff --git a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
index e7d3d3a..8f2cd3b 100644
--- a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.net.wifi.IWifiScanner;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
@@ -32,6 +33,7 @@
 import android.net.wifi.WifiScanner.ScanData;
 import android.net.wifi.WifiScanner.ScanSettings;
 import android.net.wifi.WifiSsid;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -1899,6 +1901,15 @@
 
     @Override
     protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)
+                != PackageManager.PERMISSION_GRANTED) {
+            pw.println("Permission Denial: can't dump WifiScanner from from pid="
+                    + Binder.getCallingPid()
+                    + ", uid=" + Binder.getCallingUid()
+                    + " without permission "
+                    + android.Manifest.permission.DUMP);
+            return;
+        }
         mStateMachine.dump(fd, pw, args);
     }