Merge "adbd: read, print, and ignore USB control transfers." into qt-dev (60312869) · Commits · e / os / android_system_core

adb/daemon/usb.cpp

+27 −0

Original line number	Diff line number	Diff line
		@@ -364,6 +364,33 @@ struct UsbFfsConnection : public Connection {
		bound = false;
		running = false;
		break;

		case FUNCTIONFS_SETUP: {
		LOG(INFO) << "received FUNCTIONFS_SETUP control transfer: bRequestType = "
		<< static_cast<int>(event.u.setup.bRequestType)
		<< ", bRequest = " << static_cast<int>(event.u.setup.bRequest)
		<< ", wValue = " << static_cast<int>(event.u.setup.wValue)
		<< ", wIndex = " << static_cast<int>(event.u.setup.wIndex)
		<< ", wLength = " << static_cast<int>(event.u.setup.wLength);

		if ((event.u.setup.bRequestType & USB_DIR_IN)) {
		LOG(WARNING) << "received a device-to-host control transfer, ignoring";
		} else {
		std::string buf;
		buf.resize(event.u.setup.wLength + 1);

		ssize_t rc = adb_read(control_fd_.get(), buf.data(), buf.size());
		if (rc != event.u.setup.wLength) {
		LOG(ERROR)
		<< "read " << rc
		<< " bytes when trying to read control request, expected "
		<< event.u.setup.wLength;
		}

		LOG(INFO) << "control request contents: " << buf;
		break;
		}
		}
		}
		}