Merge "Revert "ashmem: Ensure all memfds have non-executable permissions by default"" into main (eba19fb8) · Commits · e / os / android_system_core

libcutils/ashmem-dev.cpp

+2 −15

Original line number	Diff line number	Diff line
		@@ -114,15 +114,8 @@ static bool __has_memfd_support() {
		// Check if kernel support exists, otherwise fall back to ashmem.
		// This code needs to build on old API levels, so we can't use the libc
		// wrapper.
		//
		// MFD_NOEXEC_SEAL is used to match the semantics of the ashmem device,
		// which did not have executable permissions. This also seals the executable
		// permissions of the buffer (i.e. they cannot be changed by fchmod()).
		//
		// MFD_NOEXEC_SEAL implies MFD_ALLOW_SEALING.

		android::base::unique_fd fd(
		syscall(__NR_memfd_create, "test_android_memfd", MFD_CLOEXEC \| MFD_NOEXEC_SEAL));
		syscall(__NR_memfd_create, "test_android_memfd", MFD_CLOEXEC \| MFD_ALLOW_SEALING));
		if (fd == -1) {
		ALOGE("memfd_create failed: %m, no memfd support");
		return false;
		@@ -290,13 +283,7 @@ int ashmem_valid(int fd) {
		static int memfd_create_region(const char* name, size_t size) {
		// This code needs to build on old API levels, so we can't use the libc
		// wrapper.
		//
		// MFD_NOEXEC_SEAL to match the semantics of the ashmem device, which did
		// not have executable permissions. This also seals the executable
		// permissions of the buffer (i.e. they cannot be changed by fchmod()).
		//
		// MFD_NOEXEC_SEAL implies MFD_ALLOW_SEALING.
		android::base::unique_fd fd(syscall(__NR_memfd_create, name, MFD_CLOEXEC \| MFD_NOEXEC_SEAL));
		android::base::unique_fd fd(syscall(__NR_memfd_create, name, MFD_CLOEXEC \| MFD_ALLOW_SEALING));

		if (fd == -1) {
		ALOGE("memfd_create(%s, %zd) failed: %m", name, size);