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

Commit c78374df authored by Risan's avatar Risan
Browse files

Cleanup Quota limit in Installd 

Since it is not used anymore since reserved space in place and f2fs has
better quota support.

Bug: 110380029
Test: android.appsecurity.cts.StorageHostTest. 3 Tests (testCache,
testVerifyAppStats, testVerifyStats) out of 12 Tests fail before and
after this CL. And there are some quota-related tests that pass, so this
should be sufficient as sanity check
Change-Id: I1cff7000e5a39195da22d6dddf98eb804f08123b
parent 517a57bd

cmds/installd/InstalldNativeService.cpp

+0 −76
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ namespace installd { 


static constexpr const char* kCpPath = "/system/bin/cp";

static constexpr const char* kXattrDefault = "user.default";

static constexpr const char* kPropHasReserved = "vold.has_reserved";



static constexpr const int MIN_RESTRICTED_HOME_SDK_VERSION = 24; // > M
@@ -352,55 +351,6 @@ static int prepare_app_dir(const std::string& path, mode_t target_mode, uid_t ui 
    return 0;

}



/**

 * Ensure that we have a hard-limit quota to protect against abusive apps;

 * they should never use more than 90% of blocks or 50% of inodes.

 */

static int prepare_app_quota(const std::unique_ptr<std::string>& uuid ATTRIBUTE_UNUSED,

        const std::string& device, uid_t uid) {

    // Skip when reserved blocks are protecting us against abusive apps

    if (android::base::GetBoolProperty(kPropHasReserved, false)) return 0;

    // Skip when device no quotas present

    if (device.empty()) return 0;



    struct dqblk dq;

    if (quotactl(QCMD(Q_GETQUOTA, USRQUOTA), device.c_str(), uid,

            reinterpret_cast<char*>(&dq)) != 0) {

        PLOG(WARNING) << "Failed to find quota for " << uid;

        return -1;

    }



#if APPLY_HARD_QUOTAS

    if ((dq.dqb_bhardlimit == 0) || (dq.dqb_ihardlimit == 0)) {

        auto path = create_data_path(uuid ? uuid->c_str() : nullptr);

        struct statvfs stat;

        if (statvfs(path.c_str(), &stat) != 0) {

            PLOG(WARNING) << "Failed to statvfs " << path;

            return -1;

        }



        dq.dqb_valid = QIF_LIMITS;

        dq.dqb_bhardlimit =

            (((static_cast<uint64_t>(stat.f_blocks) * stat.f_frsize) / 10) * 9) / QIF_DQBLKSIZE;

        dq.dqb_ihardlimit = (stat.f_files / 2);

        if (quotactl(QCMD(Q_SETQUOTA, USRQUOTA), device.c_str(), uid,

                reinterpret_cast<char*>(&dq)) != 0) {

            PLOG(WARNING) << "Failed to set hard quota for " << uid;

            return -1;

        } else {

            LOG(DEBUG) << "Applied hard quotas for " << uid;

            return 0;

        }

    } else {

        // Hard quota already set; assume it's reasonable

        return 0;

    }

#else

    // Hard quotas disabled

    return 0;

#endif

}



static bool prepare_app_profile_dir(const std::string& packageName, int32_t appId, int32_t userId) {

    if (!property_get_bool("dalvik.vm.usejitprofiles", false)) {

        return true;
@@ -515,10 +465,6 @@ binder::Status InstalldNativeService::createAppData(const std::unique_ptr<std::s 
            return error("Failed to restorecon " + path);

        }



        if (prepare_app_quota(uuid, findQuotaDeviceForUuid(uuid), uid)) {

            return error("Failed to set hard quota " + path);

        }



        if (!prepare_app_profile_dir(packageName, appId, userId)) {

            return error("Failed to prepare profiles for " + packageName);

        }
@@ -958,13 +904,6 @@ binder::Status InstalldNativeService::createUserData(const std::unique_ptr<std:: 
        }

    }



    // Data under /data/media doesn't have an app, but we still want

    // to limit it to prevent abuse.

    if (prepare_app_quota(uuid, findQuotaDeviceForUuid(uuid),

            multiuser_get_uid(userId, AID_MEDIA_RW))) {

        return error("Failed to set hard quota for media_rw");

    }



    return ok();

}
@@ -2614,21 +2553,6 @@ binder::Status InstalldNativeService::invalidateMounts() { 
                    reinterpret_cast<char*>(&dq)) == 0) {

                LOG(DEBUG) << "Found quota mount " << source << " at " << target;

                mQuotaReverseMounts[target] = source;



                // ext4 only enables DQUOT_USAGE_ENABLED by default, so we

                // need to kick it again to enable DQUOT_LIMITS_ENABLED. We

                // only need hard limits enabled when we're not being protected

                // by reserved blocks.

                if (!android::base::GetBoolProperty(kPropHasReserved, false)) {

                    if (quotactl(QCMD(Q_QUOTAON, USRQUOTA), source.c_str(), QFMT_VFS_V1,

                            nullptr) != 0 && errno != EBUSY) {

                        PLOG(ERROR) << "Failed to enable USRQUOTA on " << source;

                    }

                    if (quotactl(QCMD(Q_QUOTAON, GRPQUOTA), source.c_str(), QFMT_VFS_V1,

                            nullptr) != 0 && errno != EBUSY) {

                        PLOG(ERROR) << "Failed to enable GRPQUOTA on " << source;

                    }

                }

            }

        }

#endif

cmds/installd/utils.h

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#define BYPASS_QUOTA 0

#define BYPASS_SDCARDFS 0



#define APPLY_HARD_QUOTAS 0



namespace android {

namespace installd {