Merge changes from topic "refactor-init-servicelist" into main (efbc08e0) · Commits · e / os / android_system_core

init/Android.bp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,6 @@ init_common_sources = [
	"capabilities.cpp",		"capabilities.cpp",
	"epoll.cpp",		"epoll.cpp",
	"import_parser.cpp",		"import_parser.cpp",
	"interface_utils.cpp",
	"interprocess_fifo.cpp",		"interprocess_fifo.cpp",
	"keychords.cpp",		"keychords.cpp",
	"parser.cpp",		"parser.cpp",
	@@ -88,6 +87,7 @@ init_device_sources = [
	init_host_sources = [		init_host_sources = [
	"check_builtins.cpp",		"check_builtins.cpp",
	"host_import_parser.cpp",		"host_import_parser.cpp",
			"interface_utils.cpp",
	]		]

	soong_config_module_type {		soong_config_module_type {
	@@ -190,7 +190,6 @@ libinit_cc_defaults {
	"libext4_utils",		"libext4_utils",
	"libfs_mgr",		"libfs_mgr",
	"libgsi",		"libgsi",
	"libhidl-gen-utils",
	"liblog",		"liblog",
	"liblogwrap",		"liblogwrap",
	"liblp",		"liblp",

init/fuzzer/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,6 @@ cc_defaults {
	shared_libs: [		shared_libs: [
	"libbase",		"libbase",
	"libfs_mgr",		"libfs_mgr",
	"libhidl-gen-utils",
	"liblog",		"liblog",
	"libprocessgroup",		"libprocessgroup",
	"libselinux",		"libselinux",
	@@ -49,7 +48,6 @@ cc_fuzz {
	srcs: [		srcs: [
	"init_parser_fuzzer.cpp",		"init_parser_fuzzer.cpp",
	],		],
	shared_libs: ["libhidlmetadata",],
	defaults: [		defaults: [
	"libinit_fuzzer_defaults",		"libinit_fuzzer_defaults",
	],		],

init/fuzzer/init_parser_fuzzer.cpp

+0 −61

Original line number	Original line	Diff line number	Diff line
	@@ -15,9 +15,7 @@
	*/		*/

	#include <fuzzer/FuzzedDataProvider.h>		#include <fuzzer/FuzzedDataProvider.h>
	#include <hidl/metadata.h>
	#include <import_parser.h>		#include <import_parser.h>
	#include <interface_utils.h>
	#include <rlimit_parser.h>		#include <rlimit_parser.h>

	using namespace android;		using namespace android;
	@@ -34,7 +32,6 @@ const std::string kValidPaths[] = {
	};		};

	const int32_t kMaxBytes = 256;		const int32_t kMaxBytes = 256;
	const std::string kValidInterfaces = "android.frameworks.vr.composer@2.0::IVrComposerClient";

	class InitParserFuzzer {		class InitParserFuzzer {
	public:		public:
	@@ -44,9 +41,6 @@ class InitParserFuzzer {
	private:		private:
	void InvokeParser();		void InvokeParser();
	void InvokeLimitParser();		void InvokeLimitParser();
	void InvokeInterfaceUtils();
	InterfaceInheritanceHierarchyMap GenerateHierarchyMap();
	std::vector<HidlInterfaceMetadata> GenerateInterfaceMetadata();

	FuzzedDataProvider fdp_;		FuzzedDataProvider fdp_;
	};		};
	@@ -64,60 +58,6 @@ void InitParserFuzzer::InvokeLimitParser() {
	}		}
	}		}

	std::vector<HidlInterfaceMetadata> InitParserFuzzer::GenerateInterfaceMetadata() {
	std::vector<HidlInterfaceMetadata> random_interface;
	for (size_t idx = 0; idx < fdp_.ConsumeIntegral<size_t>(); ++idx) {
	HidlInterfaceMetadata metadata;
	metadata.name = fdp_.ConsumeRandomLengthString(kMaxBytes);
	for (size_t idx1 = 0; idx1 < fdp_.ConsumeIntegral<size_t>(); ++idx1) {
	metadata.inherited.push_back(fdp_.ConsumeRandomLengthString(kMaxBytes));
	}
	random_interface.push_back(metadata);
	}
	return random_interface;
	}

	InterfaceInheritanceHierarchyMap InitParserFuzzer::GenerateHierarchyMap() {
	InterfaceInheritanceHierarchyMap result;
	std::vector<HidlInterfaceMetadata> random_interface;
	if (fdp_.ConsumeBool()) {
	random_interface = GenerateInterfaceMetadata();
	} else {
	random_interface = HidlInterfaceMetadata::all();
	}

	for (const HidlInterfaceMetadata& iface : random_interface) {
	std::set<FQName> inherited_interfaces;
	for (const std::string& intf : iface.inherited) {
	FQName fqname;
	(void)fqname.setTo(intf);
	inherited_interfaces.insert(fqname);
	}
	FQName fqname;
	(void)fqname.setTo(iface.name);
	result[fqname] = inherited_interfaces;
	}
	return result;
	}

	void InitParserFuzzer::InvokeInterfaceUtils() {
	InterfaceInheritanceHierarchyMap hierarchy_map = GenerateHierarchyMap();
	SetKnownInterfaces(hierarchy_map);
	IsKnownInterface(fdp_.ConsumeRandomLengthString(kMaxBytes));
	std::set<std::string> interface_set;
	for (size_t idx = 0; idx < fdp_.ConsumeIntegral<size_t>(); ++idx) {
	auto set_interface_values = fdp_.PickValueInArray<const std::function<void()>>({
	[&]() {
	interface_set.insert(("aidl/" + fdp_.ConsumeRandomLengthString(kMaxBytes)));
	},
	[&]() { interface_set.insert(fdp_.ConsumeRandomLengthString(kMaxBytes)); },
	[&]() { interface_set.insert(kValidInterfaces); },
	});
	set_interface_values();
	}
	CheckInterfaceInheritanceHierarchy(interface_set, hierarchy_map);
	}

	void InitParserFuzzer::InvokeParser() {		void InitParserFuzzer::InvokeParser() {
	Parser parser;		Parser parser;
	std::string name = fdp_.ConsumeBool() ? fdp_.ConsumeRandomLengthString(kMaxBytes) : "import";		std::string name = fdp_.ConsumeBool() ? fdp_.ConsumeRandomLengthString(kMaxBytes) : "import";
	@@ -132,7 +72,6 @@ void InitParserFuzzer::Process() {
	while (fdp_.remaining_bytes()) {		while (fdp_.remaining_bytes()) {
	auto invoke_parser_fuzzer = fdp_.PickValueInArray<const std::function<void()>>({		auto invoke_parser_fuzzer = fdp_.PickValueInArray<const std::function<void()>>({
	[&]() { InvokeParser(); },		[&]() { InvokeParser(); },
	[&]() { InvokeInterfaceUtils(); },
	[&]() { InvokeLimitParser(); },		[&]() { InvokeLimitParser(); },
	});		});
	invoke_parser_fuzzer();		invoke_parser_fuzzer();

init/host_init_verifier.cpp

+13 −3

Original line number	Original line	Diff line number	Diff line
	@@ -297,9 +297,7 @@ int main(int argc, char** argv) {
	ActionManager& am = ActionManager::GetInstance();		ActionManager& am = ActionManager::GetInstance();
	ServiceList& sl = ServiceList::GetInstance();		ServiceList& sl = ServiceList::GetInstance();
	Parser parser;		Parser parser;
	parser.AddSectionParser("service",		parser.AddSectionParser("service", std::make_unique<ServiceParser>(&sl, GetSubcontext()));
	std::make_unique<ServiceParser>(&sl, GetSubcontext(),
	*interface_inheritance_hierarchy_map));
	parser.AddSectionParser("on", std::make_unique<ActionParser>(&am, GetSubcontext()));		parser.AddSectionParser("on", std::make_unique<ActionParser>(&am, GetSubcontext()));
	parser.AddSectionParser("import", std::make_unique<HostImportParser>());		parser.AddSectionParser("import", std::make_unique<HostImportParser>());

	@@ -317,11 +315,23 @@ int main(int argc, char** argv) {
	return EXIT_FAILURE;		return EXIT_FAILURE;
	}		}
	}		}

	size_t failures = parser.parse_error_count() + am.CheckAllCommands() + sl.CheckAllCommands();		size_t failures = parser.parse_error_count() + am.CheckAllCommands() + sl.CheckAllCommands();
	if (failures > 0) {		if (failures > 0) {
	LOG(ERROR) << "Failed to parse init scripts with " << failures << " error(s).";		LOG(ERROR) << "Failed to parse init scripts with " << failures << " error(s).";
	return EXIT_FAILURE;		return EXIT_FAILURE;
	}		}

			for (const auto& service : sl) {
			if (const auto& result = CheckInterfaceInheritanceHierarchy(
			service->interfaces(), *interface_inheritance_hierarchy_map);
			!result.ok()) {
			LOG(ERROR) << service->filename() << ": invalid interface in service '"
			<< service->name() << "': " << result.error();
			return EXIT_FAILURE;
			}
			}

	return EXIT_SUCCESS;		return EXIT_SUCCESS;
	}		}

init/init.cpp

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -268,8 +268,8 @@ void DumpState() {
	Parser CreateParser(ActionManager& action_manager, ServiceList& service_list) {		Parser CreateParser(ActionManager& action_manager, ServiceList& service_list) {
	Parser parser;		Parser parser;

	parser.AddSectionParser("service", std::make_unique<ServiceParser>(		parser.AddSectionParser("service",
	&service_list, GetSubcontext(), std::nullopt));		std::make_unique<ServiceParser>(&service_list, GetSubcontext()));
	parser.AddSectionParser("on", std::make_unique<ActionParser>(&action_manager, GetSubcontext()));		parser.AddSectionParser("on", std::make_unique<ActionParser>(&action_manager, GetSubcontext()));
	parser.AddSectionParser("import", std::make_unique<ImportParser>(&parser));		parser.AddSectionParser("import", std::make_unique<ImportParser>(&parser));

	@@ -324,9 +324,7 @@ Parser CreateApexConfigParser(ActionManager& action_manager, ServiceList& servic
	}		}
	}		}
	#endif // RECOVERY		#endif // RECOVERY
	parser.AddSectionParser("service",		parser.AddSectionParser("service", std::make_unique<ServiceParser>(&service_list, subcontext));
	std::make_unique<ServiceParser>(&service_list, subcontext,
	std::nullopt));
	parser.AddSectionParser("on", std::make_unique<ActionParser>(&action_manager, subcontext));		parser.AddSectionParser("on", std::make_unique<ActionParser>(&action_manager, subcontext));

	return parser;		return parser;