From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id BCB2C388701C; Tue, 7 Apr 2020 14:04:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BCB2C388701C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/bz12683] nptl: x32: Fix Race conditions in pthread cancellation [BZ#12683] X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/bz12683 X-Git-Oldrev: 57e4b8e6c1acf454d8938cd99d4764a27fa77b60 X-Git-Newrev: f43cde177323f0bdc71ec9ac78f1985984284af0 Message-Id: <20200407140402.BCB2C388701C@sourceware.org> Date: Tue, 7 Apr 2020 14:04:02 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2020 14:04:02 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f43cde177323f0bdc71ec9ac78f1985984284af0 commit f43cde177323f0bdc71ec9ac78f1985984284af0 Author: Adhemerval Zanella Date: Sat May 9 14:20:26 2015 -0300 nptl: x32: Fix Race conditions in pthread cancellation [BZ#12683] This patches adds the x32 modification required for the BZ#12683. It follows the x86_64-x32 ABI and pointers are zero-extended. Checked on x86_64-linux-gnu-x32. Diff: --- sysdeps/unix/sysv/linux/x86_64/x32/syscall_types.h | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/syscall_types.h b/sysdeps/unix/sysv/linux/x86_64/x32/syscall_types.h new file mode 100644 index 0000000000..fd9f14d566 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/x32/syscall_types.h @@ -0,0 +1,36 @@ +/* Types and macros used for syscall issuing. x86_64/x32 version. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SYSCALL_TYPES_H +#define _SYSCALL_TYPES_H + +#include + +typedef long long int __syscall_arg_t; + +/* Syscall arguments for x32 follows x86_64 ABI, however pointers are 32 bits + should be zero extended. */ +#define __SSC(__x) \ + ({ \ + __syscall_arg_t __arg = sizeof (1 ? (__x) : 0ULL) < 8 \ + ? (unsigned long int) (uintptr_t)(__x) \ + : (__syscall_arg_t) (__typeof__ ((__x) - (__x))) (__x); \ + __arg; \ + }) + +#endif