LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistent dump() permission checking.

Browse Source 
am: c372a5cd06

Change-Id: I300f8bc07e1266b9e78f56d085cd458862176a85
This commit is contained in:
Jeff Sharkey
2017-04-03 06:19:02 +00:00
committed by android-build-merger
parent ffe196ad66 c372a5cd06
commit 67043b4932
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -124,6 +124,7 @@ import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnInfo; import com.android.internal.net.VpnInfo;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
import com.android.internal.util.AsyncChannel; import com.android.internal.util.AsyncChannel;
import com.android.internal.util.DumpUtils;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.MessageUtils; import com.android.internal.util.MessageUtils;
import com.android.internal.util.WakeupMessage; import com.android.internal.util.WakeupMessage;
@@ -1925,14 +1926,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
@Override @Override
protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) { protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
if (mContext.checkCallingOrSelfPermission( if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;
android.Manifest.permission.DUMP)
!= PackageManager.PERMISSION_GRANTED) {
pw.println("Permission Denial: can't dump ConnectivityService " +
"from from pid=" + Binder.getCallingPid() + ", uid=" +
Binder.getCallingUid());
return;
}
if (argsContain(args, "--diag")) { if (argsContain(args, "--diag")) {
dumpNetworkDiagnostics(pw); dumpNetworkDiagnostics(pw);