From patchwork Mon Dec 11 19:06:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 24865 Received: (qmail 41615 invoked by alias); 11 Dec 2017 19:07:26 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 41567 invoked by uid 89); 11 Dec 2017 19:07:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=5011, thumb X-HELO: mail-qt0-f193.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=6q7FgajN6kglFih6jNcgENhY1G2GsnK72NJVhZcldok=; b=Ila2y4FAvoM68xmeOcn12V7h3PoaqA5DjuqCgYK4OTuF3m1tq87XxbaRC62KIg2Z27 9vzlpYrOmquxAGN41zhYDY7kz79nB9TPaJ+n8P1B/iNXurBL8iPC4HFESlXe71RjAS+B +6mitLRq2nP9K0ljFeqquLcNH/XvEp2KedZP0MxZiZq4jDfndFPmM+QTQ0FJWsFeqK2/ Mun1ghMKbYGikn4yuEg48cq3W9isKzZ+EcwqShZwyxI4Lsz1R1le8VlwnyengrjdH+MB YRor9PCGiiIheK/wB7yPb9zWxwaQyPsh5tfWAp0JEjHOawTdSo4vTf/uS6GZ7TUGlJvK 3LYA== X-Gm-Message-State: AKGB3mLDKyEC2Rjb4TjLLLf5Re6mDAX0dJx6BSi/dBXe48IZPv+g4ptp uVA2NoGPqr8YzF3PIuG4zxnsi7Qxp/Y= X-Google-Smtp-Source: ACJfBosJqvgxdFEIxkPGPivSxbd8Xd0N2payKPZqceAKT6lj8JoZUp/lr60vvIvv0YqpRY+lKqgfFg== X-Received: by 10.55.167.139 with SMTP id q133mr2001728qke.328.1513019242314; Mon, 11 Dec 2017 11:07:22 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 08/19] nptl: arm: Fix Race conditions in pthread cancellation (BZ#12683) Date: Mon, 11 Dec 2017 17:06:52 -0200 Message-Id: <1513019223-7603-9-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1513019223-7603-1-git-send-email-adhemerval.zanella@linaro.org> References: <1513019223-7603-1-git-send-email-adhemerval.zanella@linaro.org> This patch adds the ARM modifications required for the BZ#12683. It basically adds the required ucontext_get_pc function and a arch specific syscall_cancel implementation. ARM requires an arch-specific syscall_cancel implementation because INTERNAL_SYSCALL_NCS may call an auxiliary symbol (__libc_do_syscall) for thumb which invalides the check on sigcancel_handler. Checked on arm-linux-gnueabihf. * sysdeps/unix/sysv/linux/arm/syscall_cancel.S: New file. * sysdeps/unix/sysv/linux/arm/sigcontextinfo.h (ucontext_get_pc): New function. Signed-off-by: Adhemerval Zanella --- ChangeLog | 4 ++ sysdeps/unix/sysv/linux/arm/sigcontextinfo.h | 12 +++++ sysdeps/unix/sysv/linux/arm/syscall_cancel.S | 69 ++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/arm/syscall_cancel.S diff --git a/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h b/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h index d3313af..8132a95 100644 --- a/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h +++ b/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h @@ -16,6 +16,10 @@ License along with the GNU C Library. If not, see . */ +#ifndef _SIGCONTEXTINFO_H +#define _SIGCONTEXTINFO_H + +#include #include #define SIGCONTEXT siginfo_t *_si, ucontext_t * @@ -46,3 +50,11 @@ (act)->sa_flags |= SA_SIGINFO; \ (sigaction) (sig, act, oact); \ }) + +static inline uintptr_t +ucontext_get_pc (const ucontext_t *uc) +{ + return uc->uc_mcontext.arm_pc; +} + +#endif /* _SIGCONTEXTINFO_H */ diff --git a/sysdeps/unix/sysv/linux/arm/syscall_cancel.S b/sysdeps/unix/sysv/linux/arm/syscall_cancel.S new file mode 100644 index 0000000..5ae1412 --- /dev/null +++ b/sysdeps/unix/sysv/linux/arm/syscall_cancel.S @@ -0,0 +1,69 @@ +/* Cancellable syscall wrapper. Linux/arm version. + Copyright (C) 2017 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 + . */ + +#include + +/* long int [r0] __syscall_cancel_arch (int *cancelhandling [r0], + long int nr [r1], + long int arg1 [r2], + long int arg2 [r3], + long int arg3 [SP], + long int arg4 [SP+4], + long int arg5 [SP+8], + long int arg6 [SP+12]) */ + + .syntax unified + +ENTRY (__syscall_cancel_arch) + .fnstart + mov ip,sp + stmfd sp!, {r4,r5,r6,r7,lr} + .save {r4,r5,r6,r7,lr} + + cfi_adjust_cfa_offset (20) + cfi_rel_offset (lr, 16) + + .globl __syscall_cancel_arch_start +__syscall_cancel_arch_start: + + /* if (*cancelhandling & CANCELED_BITMASK) + __syscall_do_cancel() */ + ldr r0, [r0] + tst r0, #4 + bne 1f + + /* Issue a 6 argument syscall, the nr [r1] being the syscall + number. */ + mov r7, r1 + mov r0, r2 + mov r1, r3 + ldmfd ip, {r2,r3,r4,r5,r6} + svc 0x0 + + .globl __syscall_cancel_arch_end +__syscall_cancel_arch_end: + ldmfd sp!, {r4,r5,r6,r7,lr} + cfi_adjust_cfa_offset (-20); + bx lr + +1: + mov lr, pc + b __syscall_do_cancel + .fnend +END (__syscall_cancel_arch) +libc_hidden_def (__syscall_cancel_arch)