diff options
author | Mike Lockwood <lockwood@android.com> | 2010-07-02 15:15:07 -0400 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2010-07-02 15:19:32 -0400 |
commit | 8e2a280ab7f98bf00ff2651f1f93c8f8bd46c08d (patch) | |
tree | d8135f979208f4b6611273fbba70624c0ea40557 /media/mtp/MtpServer.cpp | |
parent | 0250361b110267a139cc0865ff7d2f13b4d63bdf (diff) | |
download | frameworks_av-8e2a280ab7f98bf00ff2651f1f93c8f8bd46c08d.zip frameworks_av-8e2a280ab7f98bf00ff2651f1f93c8f8bd46c08d.tar.gz frameworks_av-8e2a280ab7f98bf00ff2651f1f93c8f8bd46c08d.tar.bz2 |
MTP: Fix ownership and file permissions for transferred files and folders
All new files and folders are created with group sdcard_rw
Permissions for new files are 0664 and directories 0775
Change-Id: I6d508231150f687e2e529112fd47f10e30fa594f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpServer.cpp')
-rw-r--r-- | media/mtp/MtpServer.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index cc6fdad..b9eeec5 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -113,10 +113,14 @@ static const MtpObjectFormat kSupportedPlaybackFormats[] = { // MTP_FORMAT_PLS_PLAYLIST, }; -MtpServer::MtpServer(int fd, const char* databasePath) +MtpServer::MtpServer(int fd, const char* databasePath, + int fileGroup, int filePerm, int directoryPerm) : mFD(fd), mDatabasePath(databasePath), mDatabase(NULL), + mFileGroup(fileGroup), + mFilePermission(filePerm), + mDirectoryPermission(directoryPerm), mSessionID(0), mSessionOpen(false), mSendObjectHandle(kInvalidObjectHandle), @@ -536,10 +540,11 @@ MtpResponseCode MtpServer::doSendObjectInfo() { if (format == MTP_FORMAT_ASSOCIATION) { mode_t mask = umask(0); - int ret = mkdir((const char *)path, S_IRWXU | S_IRWXG | S_IRWXO); + int ret = mkdir((const char *)path, mDirectoryPermission); umask(mask); if (ret && ret != -EEXIST) return MTP_RESPONSE_GENERAL_ERROR; + chown((const char *)path, getuid(), mFileGroup); } else { mSendObjectFilePath = path; // save the handle for the SendObject call, which should follow @@ -571,12 +576,19 @@ MtpResponseCode MtpServer::doSendObject() { if (mfr.fd < 0) { return MTP_RESPONSE_GENERAL_ERROR; } + fchown(mfr.fd, getuid(), mFileGroup); + // set permissions + mode_t mask = umask(0); + fchmod(mfr.fd, mFilePermission); + umask(mask); + mfr.offset = 0; mfr.length = mSendObjectFileSize; // transfer the file ret = ioctl(mFD, MTP_RECEIVE_FILE, (unsigned long)&mfr); close(mfr.fd); + // FIXME - we need to delete mSendObjectHandle from the database if this fails. LOGV("MTP_RECEIVE_FILE returned %d", ret); mSendObjectHandle = kInvalidObjectHandle; |