commit 23edfac445f17daac50f5206e626164c6e073753
author Nandana Dutt <nandana@google.com> Tue Sep 03 12:44:08 2019 +0100
committer Nandana Dutt <nandana@google.com> Wed Sep 04 09:23:01 2019 +0100
tree 3f3e1a7bf1c6d6db617fdb016cf50daaf7218198
parent a914cc764e255b639f2463976c98e92316ee27ea

Fix fdsan check

BUG: 140376618
Test: Downloaded a picture on Chrome (this would crash previously)
Change-Id: I7a750cde1131d19d140140dfaa0bd09131974fc0

model/VolumeBase.cpp

diff --git a/model/VolumeBase.cpp b/model/VolumeBase.cpp
index d6e4288..08da8f6 100644
--- a/model/VolumeBase.cpp
+++ b/model/VolumeBase.cpp
@@ -149,7 +149,7 @@
         return -EBUSY;
     }
 
-    mFuseFd.reset(std::move(fuseFd.get()));
+    mFuseFd = std::move(fuseFd);
     return OK;
 }
 

model/VolumeBase.h

diff --git a/model/VolumeBase.h b/model/VolumeBase.h
index 6afb88e..5deecdb 100644
--- a/model/VolumeBase.h
+++ b/model/VolumeBase.h
@@ -122,6 +122,7 @@
     status_t setId(const std::string& id);
     status_t setPath(const std::string& path);
     status_t setInternalPath(const std::string& internalPath);
+    // Takes ownership of the fd passed in.
     status_t setFuseFd(android::base::unique_fd fuseFd);
 
     android::sp<android::os::IVoldListener> getListener() const;