From patchwork Tue Nov 5 13:53:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 288520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 357A32C0091 for ; Wed, 6 Nov 2013 00:54:14 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=OPNHMuhZGMjeBd5uP3jmIh3w9HIP4+671zarFkqghRhLDD9E5c INVWo/Es2M6WVIJXS521hZDE+iTuFHHaxuqumPJrIgd53U0CVWLgYNA9K2yU2vci 2k3J/8M9LOBWps6QBH/+dgeWQ/SvOzjMOdlYbOcIiHAdFqek7wTPU0rGE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=3iS/YCo6eXeRCp/Wt1faqRV7b8k=; b=YKVmRzKH2CPDl1Qcxy24 +W3GKyDCG3a2WCtoL2eOSfOcLhmQFjkiY7H2AbQQ8bW5JtSc4rS9r2s+/mcFIPOg THcwMARA47NAYcH7t7GtN72MDsqvzdaxjBLz/e3J8roAiQ0wkAY0gV0AD8ES+hWC ck9zbzdiFGhCqUdHr0gwn/M= Received: (qmail 306 invoked by alias); 5 Nov 2013 13:54:05 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 32763 invoked by uid 89); 5 Nov 2013 13:54:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.3 required=5.0 tests=AWL, BAYES_50, FREEMAIL_FROM, RDNS_NONE, SPF_PASS, URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: mail-yh0-f51.google.com Received: from Unknown (HELO mail-yh0-f51.google.com) (209.85.213.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 05 Nov 2013 13:54:03 +0000 Received: by mail-yh0-f51.google.com with SMTP id 29so1693304yhl.10 for ; Tue, 05 Nov 2013 05:53:55 -0800 (PST) X-Received: by 10.236.35.99 with SMTP id t63mr18366023yha.19.1383659635180; Tue, 05 Nov 2013 05:53:55 -0800 (PST) Received: from gnu-tools-1.localdomain (76-220-57-190.lightspeed.sntcca.sbcglobal.net. [76.220.57.190]) by mx.google.com with ESMTPSA id g14sm36159211yhb.23.2013.11.05.05.53.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Nov 2013 05:53:54 -0800 (PST) Received: by gnu-tools-1.localdomain (Postfix, from userid 1000) id 9E91740738; Tue, 5 Nov 2013 05:53:52 -0800 (PST) Date: Tue, 5 Nov 2013 05:53:52 -0800 From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: konstantin.s.serebryany@gmail.com Subject: [PATCH 1/4] Cast pointers to uptr for 64-bit syscalls Message-ID: <20131105135352.GA3776@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes internal_syscall casts pointers to uint64. It doesn't work for x32 since 32-bit pointers are signed extended to int64. This patch casts pointers to uptr first. Tested with x32, x86-64 and x86. Please install it. Thanks. H.J. --- libsanitizer/ChangeLog.x32 | 20 +++++++++++++ libsanitizer/sanitizer_common/sanitizer_linux.cc | 38 ++++++++++++------------ 2 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 libsanitizer/ChangeLog.x32 diff --git a/libsanitizer/ChangeLog.x32 b/libsanitizer/ChangeLog.x32 new file mode 100644 index 0000000..7b54005 --- /dev/null +++ b/libsanitizer/ChangeLog.x32 @@ -0,0 +1,20 @@ +2013-11-05 H.J. Lu + + * sanitizer_common/sanitizer_linux.cc (internal_mmap): Cast + pointers to uptr for 64-bit syscalls. + (internal_munmap): Likewise. + (internal_open): Likewise. + (internal_read): Likewise. + (internal_write): Likewise. + (internal_stat): Likewise. + (internal_lstat): Likewise. + (internal_fstat): Likewise. + (internal_readlink): Likewise. + (internal_unlink): Likewise. + (internal_execve): Likewise. + (NanoTime): Likewise. + (BlockingMutex::Lock): Likewise. + (BlockingMutex::Unlock): Likewise. + (internal_ptrace): Likewise. + (internal_getdents): Likewise. + (internal_sigaltstack): Likewise. diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc index 666f15b..e48bee5 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc @@ -77,14 +77,14 @@ namespace __sanitizer { uptr internal_mmap(void *addr, uptr length, int prot, int flags, int fd, u64 offset) { #if SANITIZER_LINUX_USES_64BIT_SYSCALLS - return internal_syscall(__NR_mmap, addr, length, prot, flags, fd, offset); + return internal_syscall(__NR_mmap, (uptr)addr, length, prot, flags, fd, offset); #else return internal_syscall(__NR_mmap2, addr, length, prot, flags, fd, offset); #endif } uptr internal_munmap(void *addr, uptr length) { - return internal_syscall(__NR_munmap, addr, length); + return internal_syscall(__NR_munmap, (uptr)addr, length); } uptr internal_close(fd_t fd) { @@ -92,11 +92,11 @@ uptr internal_close(fd_t fd) { } uptr internal_open(const char *filename, int flags) { - return internal_syscall(__NR_open, filename, flags); + return internal_syscall(__NR_open, (uptr)filename, flags); } uptr internal_open(const char *filename, int flags, u32 mode) { - return internal_syscall(__NR_open, filename, flags, mode); + return internal_syscall(__NR_open, (uptr)filename, flags, mode); } uptr OpenFile(const char *filename, bool write) { @@ -106,13 +106,13 @@ uptr OpenFile(const char *filename, bool write) { uptr internal_read(fd_t fd, void *buf, uptr count) { sptr res; - HANDLE_EINTR(res, (sptr)internal_syscall(__NR_read, fd, buf, count)); + HANDLE_EINTR(res, (sptr)internal_syscall(__NR_read, fd, (uptr)buf, count)); return res; } uptr internal_write(fd_t fd, const void *buf, uptr count) { sptr res; - HANDLE_EINTR(res, (sptr)internal_syscall(__NR_write, fd, buf, count)); + HANDLE_EINTR(res, (sptr)internal_syscall(__NR_write, fd, (uptr)buf, count)); return res; } @@ -138,7 +138,7 @@ static void stat64_to_stat(struct stat64 *in, struct stat *out) { uptr internal_stat(const char *path, void *buf) { #if SANITIZER_LINUX_USES_64BIT_SYSCALLS - return internal_syscall(__NR_stat, path, buf); + return internal_syscall(__NR_stat, (uptr)path, (uptr)buf); #else struct stat64 buf64; int res = internal_syscall(__NR_stat64, path, &buf64); @@ -149,7 +149,7 @@ uptr internal_stat(const char *path, void *buf) { uptr internal_lstat(const char *path, void *buf) { #if SANITIZER_LINUX_USES_64BIT_SYSCALLS - return internal_syscall(__NR_lstat, path, buf); + return internal_syscall(__NR_lstat, (uptr)path, (uptr)buf); #else struct stat64 buf64; int res = internal_syscall(__NR_lstat64, path, &buf64); @@ -160,7 +160,7 @@ uptr internal_lstat(const char *path, void *buf) { uptr internal_fstat(fd_t fd, void *buf) { #if SANITIZER_LINUX_USES_64BIT_SYSCALLS - return internal_syscall(__NR_fstat, fd, buf); + return internal_syscall(__NR_fstat, fd, (uptr)buf); #else struct stat64 buf64; int res = internal_syscall(__NR_fstat64, fd, &buf64); @@ -181,11 +181,11 @@ uptr internal_dup2(int oldfd, int newfd) { } uptr internal_readlink(const char *path, char *buf, uptr bufsize) { - return internal_syscall(__NR_readlink, path, buf, bufsize); + return internal_syscall(__NR_readlink, (uptr)path, (uptr)buf, bufsize); } uptr internal_unlink(const char *path) { - return internal_syscall(__NR_unlink, path); + return internal_syscall(__NR_unlink, (uptr)path); } uptr internal_sched_yield() { @@ -199,7 +199,7 @@ void internal__exit(int exitcode) { uptr internal_execve(const char *filename, char *const argv[], char *const envp[]) { - return internal_syscall(__NR_execve, filename, argv, envp); + return internal_syscall(__NR_execve, (uptr)filename, (uptr)argv, (uptr)envp); } // ----------------- sanitizer_common.h @@ -217,7 +217,7 @@ uptr GetTid() { u64 NanoTime() { kernel_timeval tv = {}; - internal_syscall(__NR_gettimeofday, &tv, 0); + internal_syscall(__NR_gettimeofday, (uptr)&tv, 0); return (u64)tv.tv_sec * 1000*1000*1000 + tv.tv_usec * 1000; } @@ -539,7 +539,7 @@ void BlockingMutex::Lock() { if (atomic_exchange(m, MtxLocked, memory_order_acquire) == MtxUnlocked) return; while (atomic_exchange(m, MtxSleeping, memory_order_acquire) != MtxUnlocked) - internal_syscall(__NR_futex, m, FUTEX_WAIT, MtxSleeping, 0, 0, 0); + internal_syscall(__NR_futex, (uptr)m, FUTEX_WAIT, MtxSleeping, 0, 0, 0); } void BlockingMutex::Unlock() { @@ -547,7 +547,7 @@ void BlockingMutex::Unlock() { u32 v = atomic_exchange(m, MtxUnlocked, memory_order_relaxed); CHECK_NE(v, MtxUnlocked); if (v == MtxSleeping) - internal_syscall(__NR_futex, m, FUTEX_WAKE, 1, 0, 0, 0); + internal_syscall(__NR_futex, (uptr)m, FUTEX_WAKE, 1, 0, 0, 0); } void BlockingMutex::CheckLocked() { @@ -568,11 +568,11 @@ struct linux_dirent { // Syscall wrappers. uptr internal_ptrace(int request, int pid, void *addr, void *data) { - return internal_syscall(__NR_ptrace, request, pid, addr, data); + return internal_syscall(__NR_ptrace, request, pid, (uptr)addr, (uptr)data); } uptr internal_waitpid(int pid, int *status, int options) { - return internal_syscall(__NR_wait4, pid, status, options, 0 /* rusage */); + return internal_syscall(__NR_wait4, pid, (uptr)status, options, 0 /* rusage */); } uptr internal_getpid() { @@ -584,7 +584,7 @@ uptr internal_getppid() { } uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count) { - return internal_syscall(__NR_getdents, fd, dirp, count); + return internal_syscall(__NR_getdents, fd, (uptr)dirp, count); } uptr internal_lseek(fd_t fd, OFF_T offset, int whence) { @@ -597,7 +597,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { uptr internal_sigaltstack(const struct sigaltstack *ss, struct sigaltstack *oss) { - return internal_syscall(__NR_sigaltstack, ss, oss); + return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss); } // ThreadLister implementation.