Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[pm] restrict max number of components at parsing" into tm-dev

Browse Source
This commit is contained in:
Songchun Fan
2022-03-18 17:52:40 +00:00
committed by Android (Google) Code Review
parent 9bc9a8bdd1 d7f2a75240
commit 313009c2df
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java
View File

@@ -242,6 +242,11 @@ public class ParsingPackageUtils {
public static final int PARSE_CHATTY = 1 << 31; public static final int PARSE_CHATTY = 1 << 31;
/** The total maximum number of activities, services, providers and activity-aliases */
private static final int MAX_NUM_COMPONENTS = 30000;
private static final String MAX_NUM_COMPONENTS_ERR_MSG =
"Total number of components has exceeded the maximum number: " + MAX_NUM_COMPONENTS;
@IntDef(flag = true, prefix = { "PARSE_" }, value = { @IntDef(flag = true, prefix = { "PARSE_" }, value = {
PARSE_CHATTY, PARSE_CHATTY,
PARSE_COLLECT_CERTIFICATES, PARSE_COLLECT_CERTIFICATES,
@@ -837,11 +842,20 @@ public class ParsingPackageUtils {
if (result.isError()) { if (result.isError()) {
return input.error(result); return input.error(result);
} }
if (hasTooManyComponents(pkg)) {
return input.error(MAX_NUM_COMPONENTS_ERR_MSG);
}
} }
return input.success(pkg); return input.success(pkg);
} }
private static boolean hasTooManyComponents(ParsingPackage pkg) {
return pkg.getActivities().size() + pkg.getServices().size() + pkg.getProviders().size()
> MAX_NUM_COMPONENTS;
}
/** /**
* For parsing non-MainComponents. Main ones have an order and some special handling which is * For parsing non-MainComponents. Main ones have an order and some special handling which is
* done directly in {@link #parseSplitApplication(ParseInput, ParsingPackage, Resources, * done directly in {@link #parseSplitApplication(ParseInput, ParsingPackage, Resources,
@@ -2145,6 +2159,9 @@ public class ParsingPackageUtils {
if (result.isError()) { if (result.isError()) {
return input.error(result); return input.error(result);
} }
if (hasTooManyComponents(pkg)) {
return input.error(MAX_NUM_COMPONENTS_ERR_MSG);
}
} }
if (TextUtils.isEmpty(pkg.getStaticSharedLibName()) && TextUtils.isEmpty( if (TextUtils.isEmpty(pkg.getStaticSharedLibName()) && TextUtils.isEmpty(