Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9663a5f4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MTP: Sanitize filename provided from MTP host"

parents 0e58b9b2 e783e4b2

media/mtp/MtpServer.cpp

+13 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "MtpStringBuffer.h"



namespace android {

static const int SN_EVENT_LOG_ID = 0x534e4554;



static const MtpOperationCode kSupportedOperationCodes[] = {

    MTP_OPERATION_GET_DEVICE_INFO,
@@ -961,9 +962,20 @@ MtpResponseCode MtpServer::doSendObjectInfo() { 
    if (!parseDateTime(modified, modifiedTime))

        modifiedTime = 0;



    if ((strcmp(name, ".") == 0) || (strcmp(name, "..") == 0) ||

        (strcmp(name, "/") == 0) || (strcmp(basename(name), name) != 0)) {

        char errMsg[80];



        sprintf(errMsg, "Invalid name: %s", (const char *) name);

        ALOGE("%s (b/130656917)", errMsg);

        android_errorWriteWithInfoLog(SN_EVENT_LOG_ID, "130656917", -1, errMsg,

                                      strlen(errMsg));



        return MTP_RESPONSE_INVALID_PARAMETER;

    }

    if (path[path.size() - 1] != '/')

        path.append("/");

    path.append(name);

    path.append(basename(name));



    // check space first

    if (mSendObjectFileSize > storage->getFreeSpace())