Merge "Merge "Treat process group creation failure due to a dead process as... (b27d4a2a) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_os_Zygote.cpp

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1805,12 +1805,17 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
	if (!is_system_server && getuid() == 0) {		if (!is_system_server && getuid() == 0) {
	const int rc = createProcessGroup(uid, getpid());		const int rc = createProcessGroup(uid, getpid());
	if (rc != 0) {		if (rc != 0) {
			if (rc == -ESRCH) {
			// If process is dead, treat this as a non-fatal error
			ALOGE("createProcessGroup(%d, %d) failed: %s", uid, /* pid= */ 0, strerror(-rc));
			} else {
	fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing "		fail_fn(rc == -EROFS ? CREATE_ERROR("createProcessGroup failed, kernel missing "
	"CONFIG_CGROUP_CPUACCT?")		"CONFIG_CGROUP_CPUACCT?")
	: CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid,		: CREATE_ERROR("createProcessGroup(%d, %d) failed: %s", uid,
	/* pid= */ 0, strerror(-rc)));		/* pid= */ 0, strerror(-rc)));
	}		}
	}		}
			}

	SetGids(env, gids, is_child_zygote, fail_fn);		SetGids(env, gids, is_child_zygote, fail_fn);
	SetRLimits(env, rlimits, fail_fn);		SetRLimits(env, rlimits, fail_fn);