commit c4426c812b5d931d9b2dc6b47b1ea7fb4fa51c76
author Jeff Sharkey <jsharkey@google.com> Thu Dec 06 04:26:36 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 06 04:26:36 2018 +0000
tree 17163fd2fe40ecf86a5f72347e8960335706c363
parent 7198156c2711447d5f1d5d246e3c2aeff30e5c6c
parent 39466322163f3a32ae94acd162568cca5f91a14e

Merge "Filter proxy FD open modes to those supported."

services/core/java/com/android/server/StorageManagerService.java

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 390126c..dbea529 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -16,6 +16,8 @@
 
 package com.android.server;
 
+import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;
+import static android.os.ParcelFileDescriptor.MODE_READ_WRITE;
 import static android.os.storage.OnObbStateChangeListener.ERROR_ALREADY_MOUNTED;
 import static android.os.storage.OnObbStateChangeListener.ERROR_COULD_NOT_MOUNT;
 import static android.os.storage.OnObbStateChangeListener.ERROR_COULD_NOT_UNMOUNT;
@@ -2758,6 +2760,14 @@
     public @Nullable ParcelFileDescriptor openProxyFileDescriptor(
             int mountId, int fileId, int mode) {
         Slog.v(TAG, "mountProxyFileDescriptor");
+
+        // We only support a narrow set of incoming mode flags
+        if ((mode & MODE_READ_WRITE) == MODE_READ_WRITE) {
+            mode = MODE_READ_WRITE;
+        } else {
+            mode = MODE_READ_ONLY;
+        }
+
         try {
             synchronized (mAppFuseLock) {
                 if (mAppFuseBridge == null) {