This is an archive of the discontinued LLVM Phabricator instance.

Revert "Revert "[sanitizers] Restore internal_readlink for x32""
ClosedPublic

Authored by hjl.tools on Feb 28 2019, 9:52 AM.

Reviewers

Commits

Summary

This reverts revision 354601 and disables ReadBinaryNameCached check on
Windows since Windows has no working ReadBinaryName.

Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptFeb 28 2019, 9:52 AM

Herald added subscribers: Restricted Project, kubamracek. · View Herald Transcript

lgtm

This revision is now accepted and ready to land.Feb 28 2019, 11:21 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

compiler-rt/

trunk/

lib/

sanitizer_common/

2 lines

tests/

8 lines

	Show First 20 Lines • Show All 394 Lines • ▼ Show 20 Lines
	uptr internal_readlink(const char path, char buf, uptr bufsize) {			uptr internal_readlink(const char path, char buf, uptr bufsize) {
	#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS			#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
	return internal_syscall(SYSCALL(readlinkat), AT_FDCWD, (uptr)path, (uptr)buf,			return internal_syscall(SYSCALL(readlinkat), AT_FDCWD, (uptr)path, (uptr)buf,
	bufsize);			bufsize);
	#elif SANITIZER_OPENBSD			#elif SANITIZER_OPENBSD
	return internal_syscall(SYSCALL(readlinkat), AT_FDCWD, (uptr)path, (uptr)buf,			return internal_syscall(SYSCALL(readlinkat), AT_FDCWD, (uptr)path, (uptr)buf,
	bufsize);			bufsize);
	#else			#else
	return internal_syscall(SYSCALL(readlink), path, buf, bufsize);			return internal_syscall(SYSCALL(readlink), (uptr)path, (uptr)buf, bufsize);
	#endif			#endif
	}			}

	uptr internal_unlink(const char *path) {			uptr internal_unlink(const char *path) {
	#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS \|\| SANITIZER_OPENBSD			#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS \|\| SANITIZER_OPENBSD
	return internal_syscall(SYSCALL(unlinkat), AT_FDCWD, (uptr)path, 0);			return internal_syscall(SYSCALL(unlinkat), AT_FDCWD, (uptr)path, 0);
	#else			#else
	return internal_syscall(SYSCALL(unlink), (uptr)path);			return internal_syscall(SYSCALL(unlink), (uptr)path);
	▲ Show 20 Lines • Show All 1,704 Lines • Show Last 20 Lines

Show First 20 Lines • Show All 432 Lines • ▼ Show 20 Lines	TEST(SanitizerCommon, ReservedAddressRangeUnmap) {
address_range.Unmap(new_start, PageSize);		address_range.Unmap(new_start, PageSize);

#endif		#endif

// Unmapping in the middle of the ReservedAddressRange should fail.		// Unmapping in the middle of the ReservedAddressRange should fail.
EXPECT_DEATH(address_range.Unmap(base_addr + (PageSize * 2), PageSize), ".*");		EXPECT_DEATH(address_range.Unmap(base_addr + (PageSize * 2), PageSize), ".*");
}		}

		// Windows has no working ReadBinaryName.
		#if !SANITIZER_WINDOWS
		TEST(SanitizerCommon, ReadBinaryNameCached) {
		char buf[256];
		EXPECT_NE((uptr)0, ReadBinaryNameCached(buf, sizeof(buf)));
		}
		#endif

} // namespace __sanitizer		} // namespace __sanitizer