Merge "Check black-listed USB class before descriptor" (4f2be079) · Commits · e / os / android_frameworks_base

services/usb/java/com/android/server/usb/UsbHostManager.java

+33 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import com.android.internal.util.dump.DualDumpOutputStream;
		import com.android.server.usb.descriptors.UsbDescriptor;
		import com.android.server.usb.descriptors.UsbDescriptorParser;
		import com.android.server.usb.descriptors.UsbDeviceDescriptor;
		import com.android.server.usb.descriptors.UsbInterfaceDescriptor;
		import com.android.server.usb.descriptors.report.TextReportCanvas;
		import com.android.server.usb.descriptors.tree.UsbDescriptorsTree;

		@@ -352,8 +353,6 @@ public class UsbHostManager {
		}
		return false;
		}
		UsbDescriptorParser parser = new UsbDescriptorParser(deviceAddress, descriptors);
		logUsbDevice(parser);

		if (isBlackListed(deviceClass, deviceSubclass)) {
		if (DEBUG) {
		@@ -362,6 +361,15 @@ public class UsbHostManager {
		return false;
		}

		UsbDescriptorParser parser = new UsbDescriptorParser(deviceAddress, descriptors);
		if (deviceClass == UsbConstants.USB_CLASS_PER_INTERFACE
		&& !checkUsbInterfacesBlackListed(parser)) {
		return false;
		}

		// Potentially can block as it may read data from the USB device.
		logUsbDevice(parser);

		synchronized (mLock) {
		if (mDevices.get(deviceAddress) != null) {
		Slog.w(TAG, "device already on mDevices list: " + deviceAddress);
		@@ -513,6 +521,29 @@ public class UsbHostManager {
		}
		}

		private boolean checkUsbInterfacesBlackListed(UsbDescriptorParser parser) {
		// Device class needs to be obtained through the device interface. Ignore device only
		// if ALL interfaces are black-listed.
		boolean shouldIgnoreDevice = false;
		for (UsbDescriptor descriptor: parser.getDescriptors()) {
		if (!(descriptor instanceof UsbInterfaceDescriptor)) {
		continue;
		}
		UsbInterfaceDescriptor iface = (UsbInterfaceDescriptor) descriptor;
		shouldIgnoreDevice = isBlackListed(iface.getUsbClass(), iface.getUsbSubclass());
		if (!shouldIgnoreDevice) {
		break;
		}
		}
		if (shouldIgnoreDevice) {
		if (DEBUG) {
		Slog.d(TAG, "usb interface class is black listed");
		}
		return false;
		}
		return true;
		}

		private native void monitorUsbHostBus();
		private native ParcelFileDescriptor nativeOpenDevice(String deviceAddress);
		}