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

Commit 2360c2a7 authored by Xin Li's avatar Xin Li
Browse files

Merge QQ3A.200605.002 into master 

Bug: 158095402
Merged-In: Iea2c5fb12ea7b1ad563f540349063fcda557fbc1
Change-Id: Ie56daaaf7d1e9dfddf0dcd1adda00a3732671b0d
parents ed38697b 560de158

cmds/installd/InstalldNativeService.cpp

+0 −20
Original line number Diff line number Diff line
@@ -2331,26 +2331,6 @@ binder::Status InstalldNativeService::compileLayouts(const std::string& apkPath, 
    return *_aidl_return ? ok() : error("viewcompiler failed");

}



binder::Status InstalldNativeService::markBootComplete(const std::string& instructionSet) {

    ENFORCE_UID(AID_SYSTEM);

    std::lock_guard<std::recursive_mutex> lock(mLock);



    const char* instruction_set = instructionSet.c_str();



    char boot_marker_path[PKG_PATH_MAX];

    sprintf(boot_marker_path,

          "%s/%s/%s/.booting",

          android_data_dir.c_str(),

          DALVIK_CACHE,

          instruction_set);



    ALOGV("mark_boot_complete : %s", boot_marker_path);

    if (unlink(boot_marker_path) != 0) {

        return error(StringPrintf("Failed to unlink %s", boot_marker_path));

    }

    return ok();

}



binder::Status InstalldNativeService::linkNativeLibraryDirectory(

        const std::optional<std::string>& uuid, const std::string& packageName,

        const std::string& nativeLibPath32, int32_t userId) {

cmds/installd/InstalldNativeService.h

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ public: 
            int32_t uid);

    binder::Status removeIdmap(const std::string& overlayApkPath);

    binder::Status rmPackageDir(const std::string& packageDir);

    binder::Status markBootComplete(const std::string& instructionSet);

    binder::Status freeCache(const std::optional<std::string>& uuid, int64_t targetFreeBytes,

            int64_t cacheReservedBytes, int32_t flags);

    binder::Status linkNativeLibraryDirectory(const std::optional<std::string>& uuid,

cmds/installd/binder/android/os/IInstalld.aidl

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ interface IInstalld { 
    void idmap(@utf8InCpp String targetApkPath, @utf8InCpp String overlayApkPath, int uid);

    void removeIdmap(@utf8InCpp String overlayApkPath);

    void rmPackageDir(@utf8InCpp String packageDir);

    void markBootComplete(@utf8InCpp String instructionSet);

    void freeCache(@nullable @utf8InCpp String uuid, long targetFreeBytes,

            long cacheReservedBytes, int flags);

    void linkNativeLibraryDirectory(@nullable @utf8InCpp String uuid,

libs/binder/BufferedTextOutput.cpp

+2 −1
Original line number Diff line number Diff line
@@ -49,9 +49,10 @@ struct BufferedTextOutput::BufferState : public RefBase 
    }

    

    status_t append(const char* txt, size_t len) {

        if (len > SIZE_MAX - bufferPos) return NO_MEMORY; // overflow

        if ((len+bufferPos) > bufferSize) {

            if ((len + bufferPos) > SIZE_MAX / 3) return NO_MEMORY; // overflow

            size_t newSize = ((len+bufferPos)*3)/2;

            if (newSize < (len+bufferPos)) return NO_MEMORY;    // overflow

            void* b = realloc(buffer, newSize);

            if (!b) return NO_MEMORY;

            buffer = (char*)b;

libs/binder/Parcel.cpp

+8 −2
Original line number Diff line number Diff line
@@ -422,8 +422,10 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len) 
        const sp<ProcessState> proc(ProcessState::self());

        // grow objects

        if (mObjectsCapacity < mObjectsSize + numObjects) {

            if ((size_t) numObjects > SIZE_MAX - mObjectsSize) return NO_MEMORY; // overflow

            if (mObjectsSize + numObjects > SIZE_MAX / 3) return NO_MEMORY; // overflow

            size_t newSize = ((mObjectsSize + numObjects)*3)/2;

            if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY;   // overflow

            if (newSize > SIZE_MAX / sizeof(binder_size_t)) return NO_MEMORY; // overflow

            binder_size_t *objects =

                (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t));

            if (objects == (binder_size_t*)nullptr) {
@@ -1373,8 +1375,10 @@ restart_write: 
        if (err != NO_ERROR) return err;

    }

    if (!enoughObjects) {

        if (mObjectsSize > SIZE_MAX - 2) return NO_MEMORY; // overflow

        if ((mObjectsSize + 2) > SIZE_MAX / 3) return NO_MEMORY; // overflow

        size_t newSize = ((mObjectsSize+2)*3)/2;

        if (newSize*sizeof(binder_size_t) < mObjectsSize) return NO_MEMORY;   // overflow

        if (newSize > SIZE_MAX / sizeof(binder_size_t)) return NO_MEMORY; // overflow

        binder_size_t* objects = (binder_size_t*)realloc(mObjects, newSize*sizeof(binder_size_t));

        if (objects == nullptr) return NO_MEMORY;

        mObjects = objects;
@@ -2606,6 +2610,8 @@ status_t Parcel::growData(size_t len) 
        return BAD_VALUE;

    }



    if (len > SIZE_MAX - mDataSize) return NO_MEMORY; // overflow

    if (mDataSize + len > SIZE_MAX / 3) return NO_MEMORY; // overflow

    size_t newSize = ((mDataSize+len)*3)/2;

    return (newSize <= mDataSize)

            ? (status_t) NO_MEMORY