From patchwork Mon Sep 28 19:18:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40529 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 45AE039450E5; Mon, 28 Sep 2020 19:18:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 45AE039450E5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1601320719; bh=nk6PK0zkDItagtJW4/mbvQpcCzffYEOYpro1FoZq7YU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=PRmmcKjM3VsFdCO5L6DEncC1r9qPnIBeqtjxBUUXnci71HttmsG3zczuMVKEbjfQs WY25OYGMiMVzABULSUONg+GJR34YNEhEXH7UvdU1b+xgLp8d+Grf2sEtVthrCw2+HR 2H5dUGxbpm/t+4tYiBd9jsxaws5hp+NoMo1XOWKY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) by sourceware.org (Postfix) with ESMTPS id C4C0D3861830 for ; Mon, 28 Sep 2020 19:18:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C4C0D3861830 Received: by mail-qk1-x72a.google.com with SMTP id q63so2089376qkf.3 for ; Mon, 28 Sep 2020 12:18:36 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=nk6PK0zkDItagtJW4/mbvQpcCzffYEOYpro1FoZq7YU=; b=q4COJpqw5xaZVsA+0U5/a6k9f41lOeDPgIB7rZ8gc1nzvVunRmFV+mUbDh4kLNWyy9 ooCNs+bkfljA8RjrXjFi9/Y7AyTIcvNZApLRoleJfPtAWcPdDhD1XEgU2nBzyvvINLMX rGF5B6lHM0xwP67JQeTKp834Ox0r5e0vdLp4dHPcl76e36dprh28cZ21eSXtLe+qwN3R 2ulYVkGIN9hZioCU0ZZyPuE8pRbSm3b6eE+vHHsaGHni4e2C33LfxSuOBvwwBhmkLEXB WoZv1ioYi3+KvsWUs23QFVEM2cor7NwxJ6Z1G+HkRA5B5lePoRLnwfszh4KDHb75EdAB 2l+w== X-Gm-Message-State: AOAM530LfPigTVobx9nurRJobRWdO01uXORZ6vmksZi8XTL7zfBjyh45 3tZzNsQPxafdV5W9FskArebH4UeD9l2T5w== X-Google-Smtp-Source: ABdhPJz53I+Zm1dhO2sGd8XmDG5ztCHRXjLyNZNC+1XaPDR3KHvgpZCGerQnCKjXBpr8FzWz4rU+lQ== X-Received: by 2002:a37:e305:: with SMTP id y5mr946402qki.315.1601320716075; Mon, 28 Sep 2020 12:18:36 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id n7sm2430200qtf.27.2020.09.28.12.18.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 12:18:35 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [COMMITTED] nptl: Fix __futex_abstimed_wait_cancellable32 Date: Mon, 28 Sep 2020 16:18:31 -0300 Message-Id: <20200928191831.1324596-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Similar to 64-bit time __futex_abstimed_wait_cancellable64, it should check for overflow and convert to 32-bit timespec iff timeout is not NULL. It fixes some regression on i686-linux-gnu running on a 4.15 kernel. --- sysdeps/nptl/futex-internal.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c index adb3c20611..1594cb6166 100644 --- a/sysdeps/nptl/futex-internal.c +++ b/sysdeps/nptl/futex-internal.c @@ -29,16 +29,22 @@ __futex_abstimed_wait_cancellable32 (unsigned int* futex_word, const struct __timespec64* abstime, int private) { - if (! in_time_t_range (abstime->tv_sec)) - return -EOVERFLOW; + struct timespec ts32, *pts32 = NULL; + if (abstime != NULL) + { + if (! in_time_t_range (abstime->tv_sec)) + return -EOVERFLOW; + + ts32 = valid_timespec64_to_timespec (*abstime); + pts32 = &ts32; + } unsigned int clockbit = (clockid == CLOCK_REALTIME) ? FUTEX_CLOCK_REALTIME : 0; int op = __lll_private_flag (FUTEX_WAIT_BITSET | clockbit, private); - struct timespec ts32 = valid_timespec64_to_timespec (*abstime); return INTERNAL_SYSCALL_CANCEL (futex, futex_word, op, expected, - &ts32, NULL /* Unused. */, + pts32, NULL /* Unused. */, FUTEX_BITSET_MATCH_ANY); } #endif