Commit: cea1c6248b6993565b90eb8ea3020ad851ba4e29 - system-core (git)

system/core

Commit MetaInfo

• Révision: cea1c6248b6993565b90eb8ea3020ad851ba4e29 (tree)
• l'heure: 2019-05-21 09:29:18
• Auteur: Josh Gao <jmgao@goog...>
• Commiter: android-build-merger

Message de Log

Merge "adbd: read, print, and ignore USB control transfers." into qt-dev
am: 6031286936

Change-Id: Iff482249f9442a851e2681869babc2bcb081385b

Change Summary

• modified: adb/daemon/usb.cpp

Modification

--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -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;
+                        }
+                    }
                 }
             }