commit 9596a4afe247079395f8ee14295b2bd58c994e7a
author Luis Hector Chavez <lhchavez@google.com> Mon Mar 26 18:56:38 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 26 18:56:38 2018 +0000
tree 43105db2c9f99dec42daafbd57d35e43d04f6d4d
parent 4ce2dc713682d67da8db9f5a472d03b202569638
parent 02febdaa62d196398b5513ee0a410efb7e29a928

Merge "adb: Open FunctionFS files with more restrictive access modes"
am: f78ff013d0

Change-Id: I867878aba35e47c66a9f501cd1cf9b979d5bc8a9

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index c58c67a..ab11bdd 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -269,7 +269,7 @@
 
     if (h->control < 0) { // might have already done this before
         LOG(INFO) << "opening control endpoint " << USB_FFS_ADB_EP0;
-        h->control = adb_open(USB_FFS_ADB_EP0, O_RDWR);
+        h->control = adb_open(USB_FFS_ADB_EP0, O_WRONLY);
         if (h->control < 0) {
             PLOG(ERROR) << "cannot open control endpoint " << USB_FFS_ADB_EP0;
             goto err;
@@ -300,13 +300,13 @@
         android::base::SetProperty("sys.usb.ffs.ready", "1");
     }
 
-    h->bulk_out = adb_open(USB_FFS_ADB_OUT, O_RDWR);
+    h->bulk_out = adb_open(USB_FFS_ADB_OUT, O_RDONLY);
     if (h->bulk_out < 0) {
         PLOG(ERROR) << "cannot open bulk-out endpoint " << USB_FFS_ADB_OUT;
         goto err;
     }
 
-    h->bulk_in = adb_open(USB_FFS_ADB_IN, O_RDWR);
+    h->bulk_in = adb_open(USB_FFS_ADB_IN, O_WRONLY);
     if (h->bulk_in < 0) {
         PLOG(ERROR) << "cannot open bulk-in endpoint " << USB_FFS_ADB_IN;
         goto err;