Merge "servicemanager: restrict service name characters" into stage-aosp-master am: 8f4c72d3de (4ac80bc0) · Commits · e / os / platform_frameworks_native

cmds/servicemanager/ServiceManager.cpp

+17 −2

Original line number	Diff line number	Diff line
		@@ -63,6 +63,21 @@ Status ServiceManager::checkService(const std::string& name, sp<IBinder>* outBin
		return Status::ok();
		}

		bool isValidServiceName(const std::string& name) {
		if (name.size() == 0) return false;
		if (name.size() > 127) return false;

		for (char c : name) {
		if (c == '_' \|\| c == '-' \|\| c == '.') continue;
		if (c >= 'a' && c <= 'z') continue;
		if (c >= 'A' && c <= 'Z') continue;
		if (c >= '0' && c <= '9') continue;
		return false;
		}

		return true;
		}

		Status ServiceManager::addService(const std::string& name, const sp<IBinder>& binder, bool allowIsolated, int32_t dumpPriority) {
		auto ctx = mAccess->getCallingContext(name);

		@@ -79,8 +94,8 @@ Status ServiceManager::addService(const std::string& name, const sp<IBinder>& bi
		return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT);
		}

		// match legacy rules
		if (name.size() == 0 \|\| name.size() > 127) {
		if (!isValidServiceName(name)) {
		LOG(ERROR) << "Invalid service name: " << name;
		return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT);
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,12 @@ TEST(AddService, TooLongNameDisallowed) {
		IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT).isOk());
		}

		TEST(AddService, WeirdCharactersDisallowed) {
		auto sm = getPermissiveServiceManager();
		EXPECT_FALSE(sm->addService("happy$foo$foo", getBinder(), false /allowIsolated/,
		IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT).isOk());
		}

		TEST(AddService, AddNullServiceDisallowed) {
		auto sm = getPermissiveServiceManager();
		EXPECT_FALSE(sm->addService("foo", nullptr, false /allowIsolated/,