commit 2cd283ebf82d60ff1f15a4e53db70a4bec7ec816
author Makoto Onuki <omakoto@google.com> Wed Jun 24 21:17:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 21:17:45 2015 +0000
tree 1572fbdb330f4db39c4603010ff29728fc95c1c2
parent 55c09b2e6f1d1bf5b5c96bde388b08bd9354e08e
parent 34507d60ad50f8953226a4699c67dd9f4e38a5b9

am 34507d60: am 5d268fda: Merge "Make sure volume is vfat before fsck\'ing." into mnc-dev

* commit '34507d60ad50f8953226a4699c67dd9f4e38a5b9':
  Make sure volume is vfat before fsck'ing.

PublicVolume.cpp

diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index 9d6887d..d17853b 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -94,6 +94,11 @@
     // TODO: expand to support mounting other filesystems
     readMetadata();
 
+    if (mFsType != "vfat") {
+        LOG(ERROR) << getId() << " unsupported filesystem " << mFsType;
+        return -EIO;
+    }
+
     if (vfat::Check(mDevPath)) {
         LOG(ERROR) << getId() << " failed filesystem check";
         return -EIO;