Merge "adbd: make a PR_CAPBSET_DROP error fatal." (57134ade) · Commits · e / os / android_system_core

adb/daemon/main.cpp

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -54,11 +54,7 @@ static void drop_capabilities_bounding_set_if_needed() {
	}		}

	int err = prctl(PR_CAPBSET_DROP, i, 0, 0, 0);		int err = prctl(PR_CAPBSET_DROP, i, 0, 0, 0);
			if (err < 0) {
	// Some kernels don't have file capabilities compiled in, and
	// prctl(PR_CAPBSET_DROP) returns EINVAL. Don't automatically
	// die when we see such misconfigured kernels.
	if ((err < 0) && (errno != EINVAL)) {
	PLOG(FATAL) << "Could not drop capabilities";		PLOG(FATAL) << "Could not drop capabilities";
	}		}
	}		}