From patchwork Mon Nov 11 16:34:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 1193017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-106893-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="QfDT6oGg"; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="VcLBfgQz"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Bc191Nbxz9sPc for ; Tue, 12 Nov 2019 03:35:08 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=EfYDqybINmt6znhxeB+uwa9GvBwMXj1QoIds/WG10SW0xJNfwEWam odZM75uOHOF9j8xBwPL3J1OtvC0NW46cdsB1sEIihcNcA0D2uZsbz+E1BMxwBlcF NPkzfrbjE1jtFJhtM8n+ceDsNV3jibpsBphU7x9/yTXLzjXy7fVZ8w= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=/DxJFk6JQi1Ee7u9Y/VdOFaVDJw=; b=QfDT6oGgbQKza7pnJwoG28baDweb 5yjb7Z4QqKiVjXVOzAqDvbUKet8dwOoxiMwmn7Um3WAgT1KHsYhaLldF/RQoG61b hlX4dEbOtuRhYwmbHGRbV5W7smsEVtNkkGILw3M7RKqBLrzeyaKd5fBwE/4jIOh5 SZSJsRQ5mI66ehc= Received: (qmail 106247 invoked by alias); 11 Nov 2019 16:35:02 -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 106239 invoked by uid 89); 11 Nov 2019 16:35:02 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qt1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id; bh=iTDwha9L8tMePsRHFypZQz/Kj2GcogjHbFhxY38pE74=; b=VcLBfgQzpeDe4syM2MVHrgHrwq6ycabm+cgCwTWBAh/bsGOk4gLY1D0BLArIRXWmEn JptEP0jl+k1v1XolV8V88SBOa2g/gYQ2HgDTzWDcRnbjseUHGsxqrAfxJAyhbAr2GCGn 9R1jHHzDT14WJK77X6SlBogVM0zaak9wP04226+2Po8GzRv/bqvATOn87WX/WaRtWN9H 2t32wznx2/iqCSOtKGB6rFARuTw+4+BSf+RNjQLqFapNbFWTF7bAdBtQRo+vxfT58bB4 SvcfjxJpoh2LrkREjWBjtaV+H15n1uT4vhCVaXlZQlj0mi9E4o6ErqNqsJrgvqwt1J+U OrSg== From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] Fix clock_nanosleep when interrupted by a signal Date: Mon, 11 Nov 2019 13:34:54 -0300 Message-Id: <20191111163454.22535-1-adhemerval.zanella@linaro.org> This patch fixes the time64 support (added by 2e44b10b42d) where it misses the remaining argument updated if __NR_clock_nanosleep returns EINTR. Checked on i686-linux-gnu on 4.15 kernel (no time64 support) and on 5.3 kernel (with time64 support). Change-Id: Ie2d3ffdcf52a9a4f1e49466fd6abece31a7c7e69 --- sysdeps/unix/sysv/linux/clock_nanosleep.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c index 60c61ee277..fc47c58ee7 100644 --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -52,13 +52,10 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, err, clock_id, flags, req, rem); - if (r == 0 || errno != ENOSYS) - { - return (INTERNAL_SYSCALL_ERROR_P (r, err) - ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); - } + if (r != -ENOSYS) + return (INTERNAL_SYSCALL_ERROR_P (r, err) + ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); # endif /* __NR_clock_nanosleep_time64 */ - struct timespec ts32, tr32; if (! in_time_t_range (req->tv_sec)) { @@ -66,11 +63,12 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec return -1; } - ts32 = valid_timespec64_to_timespec (*req); + struct timespec tr32; + struct timespec ts32 = valid_timespec64_to_timespec (*req); r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep, err, clock_id, flags, &ts32, &tr32); - if (r == 0 && rem != NULL) + if (r == -EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0) *rem = valid_timespec_to_timespec64 (tr32); #endif /* __ASSUME_TIME64_SYSCALLS */ @@ -89,7 +87,7 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, treq64 = valid_timespec_to_timespec64 (*req); r = __clock_nanosleep_time64 (clock_id, flags, &treq64, &trem64); - if (r == 0 && rem != NULL) + if (r == EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0) *rem = valid_timespec64_to_timespec (trem64); return r;