From patchwork Wed May 24 19:31:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 69995 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 F02A93858D39 for ; Wed, 24 May 2023 19:31:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F02A93858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684956718; bh=7UgwhMxZnKzD8Chzyyj7FysQ4vthxdYgRm/6h70VDeA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=EWSpL9QOIvZq0txTrqhTWABOrynhOPFIkmEzsFeuoH+jRwKnYkP3R33JU/JvJgBqD 5zB9yYvSoqyB43yhZ3PCY0VPbdbP/JkctjLzifx2b4paLSnKXWX71TJJ6Gv8mMIgOj IQFLyZPBauCHsYBn2UPY9f/NaS3DVX6vvB3LFsSg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oo1-xc2d.google.com (mail-oo1-xc2d.google.com [IPv6:2607:f8b0:4864:20::c2d]) by sourceware.org (Postfix) with ESMTPS id 54AAE3858D28 for ; Wed, 24 May 2023 19:31:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 54AAE3858D28 Received: by mail-oo1-xc2d.google.com with SMTP id 006d021491bc7-54fa79be6e8so462928eaf.2 for ; Wed, 24 May 2023 12:31:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684956692; x=1687548692; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7UgwhMxZnKzD8Chzyyj7FysQ4vthxdYgRm/6h70VDeA=; b=cduZL695jC2DcppT3AeQJf9UOyMvIltX/x72Lml2JR+F08pliGjGAKtiNahADYGoOM WnVMBM0sao8tyVN1v4g290UJrIvp49kqbqFYJ6IzMIXc2kub7M9GF63xJyvn9vKQ89OF pcp5HIDPtscHK8cwLDLKY9M/lfmLrT8g39LRR93Szr6UxeI08/8nbe0Z0VzWZ2BswiNy CnJ2CVfZYUhLU9MNlavPXVNXC/THx8B0PXiTe9mrnCb8nkNU/T/pjyQXTVglFWuHerND VkAsX8Dtw8GjNu3Rviri19vEk3U/F0ERWYzETXB5zvPuulfivqZm6rArbRcEsTc6X86s ObYg== X-Gm-Message-State: AC+VfDwsVeGR500NvnaLkOAnK1hxRd8g4tTgWJDeiTQA7BlaVNYLopLW RFYEjImMU2c0D1B3XBjcsQXl91xddLCSLHFqv8xkAg== X-Google-Smtp-Source: ACHHUZ7+QXS7FTZbDNm0Xx5gQzvFwzCElXbQt8D//0hjG6eHuFzCdr/Cjl0jpX0KcFSuHA5qa8kfkA== X-Received: by 2002:a54:4707:0:b0:398:59be:9997 with SMTP id k7-20020a544707000000b0039859be9997mr405550oik.24.1684956692106; Wed, 24 May 2023 12:31:32 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c1:2e05:f967:11be:41d2:df25]) by smtp.gmail.com with ESMTPSA id bn12-20020a056820180c00b0054fba751207sm3434824oob.47.2023.05.24.12.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 12:31:31 -0700 (PDT) To: libc-alpha@sourceware.org, Bo YU Subject: [PATCH] io: Fix record locking contants on 32 bit arch with 64 bit default time_t (BZ#30477) Date: Wed, 24 May 2023 16:31:27 -0300 Message-Id: <20230524193127.2720861-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" For architecture with default 64 bit time_t support, the kernel does not provide LFS and non-LFS values for F_GETLK, F_GETLK, and F_GETLK (the default value used for 64 bit architecture are used). This is might be considered an ABI break, but the currenct exported values is bogus anyway. The POSIX lockf is not affected since it is aliased to lockf64, which already uses the LFS values. Checked on i686-linux-gnu and the new tests on a riscv32. --- io/Makefile | 1 + io/tst-fcntl-lock.c | 218 +++++++++++++++++++++ sysdeps/unix/sysv/linux/bits/fcntl-linux.h | 2 +- 3 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 io/tst-fcntl-lock.c diff --git a/io/Makefile b/io/Makefile index db886ca26f..d573064ecc 100644 --- a/io/Makefile +++ b/io/Makefile @@ -175,6 +175,7 @@ tests := \ tst-fchmodat \ tst-fchownat \ tst-fcntl \ + tst-fcntl-lock \ tst-fstatat \ tst-fts \ tst-fts-lfs \ diff --git a/io/tst-fcntl-lock.c b/io/tst-fcntl-lock.c new file mode 100644 index 0000000000..8735b147f7 --- /dev/null +++ b/io/tst-fcntl-lock.c @@ -0,0 +1,218 @@ +/* Test for advisory record locking. + Copyright (C) 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . +*/ + +#include +#include +#include +#include + +#include +#include +#include + +static char *temp_filename; +static int temp_fd; + +static void +do_prepare (int argc, char **argv) +{ + temp_fd = create_temp_file ("tst-fcntl-lock.", &temp_filename); + TEST_VERIFY_EXIT (temp_fd != -1); +} +#define PREPARE do_prepare + +/* This is essentially the POSIX lockf. */ + +enum fcntl_lock_cmd +{ + TEST, + ULOCK, + LOCK, + TLOCK, +}; + +static inline __attribute_artificial__ int +fcntl_lockf (int fd, enum fcntl_lock_cmd cmd, off_t len) +{ + struct flock fl = { + .l_type = F_WRLCK, + .l_whence = SEEK_CUR, + .l_len = len + }; + + switch (cmd) + { + case TEST: + fl.l_type = F_RDLCK; + if (fcntl (fd, F_GETLK, &fl) < 0) + return -1; + if (fl.l_type == F_UNLCK || fl.l_pid == getpid ()) + return 0; + errno = EACCES; + return -1; + + case ULOCK: + fl.l_type = F_UNLCK; + return fcntl (fd, F_SETLK, &fl); + + case LOCK: + return fcntl (fd, F_SETLKW, &fl); + + case TLOCK: + return fcntl (fd, F_SETLK, &fl); + } + + errno = EINVAL; + return -1; +} + +static inline __attribute_artificial__ int +fcntl64_lockf (int fd, enum fcntl_lock_cmd cmd, off64_t len64) +{ + struct flock64 fl64 = { + .l_type = F_WRLCK, + .l_whence = SEEK_CUR, + .l_len = len64 + }; + + switch (cmd) + { + case TEST: + fl64.l_type = F_RDLCK; + if (fcntl64 (fd, F_GETLK64, &fl64) < 0) + return -1; + if (fl64.l_type == F_UNLCK || fl64.l_pid == getpid ()) + return 0; + errno = EACCES; + return -1; + + case ULOCK: + fl64.l_type = F_UNLCK; + return fcntl64 (fd, F_SETLK64, &fl64); + + case LOCK: + return fcntl64 (fd, F_SETLKW64, &fl64); + + case TLOCK: + return fcntl64 (fd, F_SETLK64, &fl64); + } + + errno = EINVAL; + return -1; +} + +static void +do_test_child_lockf (void *closure) +{ + /* Check if parent has [0, 1024) locked. */ + TEST_COMPARE (lseek (temp_fd, 0, SEEK_SET), 0); + TEST_COMPARE (fcntl_lockf (temp_fd, TLOCK, 1024), -1); + TEST_COMPARE (errno, EAGAIN); + TEST_COMPARE (fcntl_lockf (temp_fd, TEST, 1024), -1); + TEST_COMPARE (errno, EACCES); + /* Also Check if parent has last 1024 bytes locked. */ + TEST_COMPARE (lseek (temp_fd, INT32_MAX-1024, SEEK_SET), INT32_MAX-1024); + TEST_COMPARE (fcntl_lockf (temp_fd, TEST, 1024), -1); + + /* And try to lock [1024, 2048). */ + TEST_COMPARE (lseek (temp_fd, 1024, SEEK_SET), 1024); + TEST_COMPARE (fcntl_lockf (temp_fd, LOCK, 1024), 0); + + /* Check if non-LFS interface cap access to 32-bif off_t. */ + TEST_COMPARE (lseek64 (temp_fd, (off64_t)INT32_MAX, SEEK_SET), + (off64_t)INT32_MAX); + TEST_COMPARE (fcntl64_lockf (temp_fd, TEST, 1024), 0); +} + +static void +do_test_child_lockf64 (void *closure) +{ + /* Check if parent has [0, 1024) locked. */ + TEST_COMPARE (lseek64 (temp_fd, 0, SEEK_SET), 0); + TEST_COMPARE (fcntl64_lockf (temp_fd, TLOCK, 1024), -1); + TEST_COMPARE (errno, EAGAIN); + TEST_COMPARE (fcntl64_lockf (temp_fd, TEST, 1024), -1); + TEST_COMPARE (errno, EACCES); + /* Also Check if parent has last 1024 bytes locked. */ + TEST_COMPARE (lseek64 (temp_fd, INT32_MAX-1024, SEEK_SET), INT32_MAX-1024); + TEST_COMPARE (fcntl64_lockf (temp_fd, TEST, 1024), -1); + + /* And try to lock [1024, 2048). */ + TEST_COMPARE (lseek64 (temp_fd, 1024, SEEK_SET), 1024); + TEST_COMPARE (fcntl64_lockf (temp_fd, LOCK, 1024), 0); + + /* And also [INT32_MAX, INT32_MAX+1024). */ + { + off64_t off = (off64_t)INT32_MAX; + TEST_COMPARE (lseek64 (temp_fd, off, SEEK_SET), off); + TEST_COMPARE (fcntl64_lockf (temp_fd, LOCK, 1024), 0); + } + + /* Check if [INT32_MAX+1024, INT64_MAX) is locked. */ + { + off64_t off = (off64_t)INT32_MAX+1024; + TEST_COMPARE (lseek64 (temp_fd, off, SEEK_SET), off); + TEST_COMPARE (fcntl64_lockf (temp_fd, TLOCK, 1024), -1); + TEST_COMPARE (errno, EAGAIN); + TEST_COMPARE (fcntl64_lockf (temp_fd, TEST, 1024), -1); + TEST_COMPARE (errno, EACCES); + } +} + +static int +do_test (void) +{ + /* Basic tests to check if a lock can be obtained and checked. */ + TEST_COMPARE (fcntl_lockf (temp_fd, LOCK, 1024), 0); + TEST_COMPARE (fcntl_lockf (temp_fd, LOCK, INT32_MAX), 0); + TEST_COMPARE (fcntl_lockf (temp_fd, TLOCK, 1024), 0); + TEST_COMPARE (fcntl_lockf (temp_fd, TEST, 1024), 0); + TEST_COMPARE (lseek (temp_fd, 1024, SEEK_SET), 1024); + TEST_COMPARE (fcntl_lockf (temp_fd, ULOCK, 1024), 0); + /* Parent process should have ([0, 1024), [2048, INT32_MAX)) ranges locked. */ + + { + struct support_capture_subprocess result; + result = support_capture_subprocess (do_test_child_lockf, NULL); + support_capture_subprocess_check (&result, "lockf", 0, sc_allow_none); + } + + if (sizeof (off_t) != sizeof (off64_t)) + { + /* Check if previously locked regions with LFS symbol. */ + TEST_COMPARE (lseek (temp_fd, 0, SEEK_SET), 0); + TEST_COMPARE (fcntl64_lockf (temp_fd, LOCK, 1024), 0); + TEST_COMPARE (fcntl64_lockf (temp_fd, TLOCK, 1024), 0); + TEST_COMPARE (fcntl64_lockf (temp_fd, TEST, 1024), 0); + /* Lock region [INT32_MAX+1024, INT64_MAX). */ + off64_t off = (off64_t)INT32_MAX + 1024; + TEST_COMPARE (lseek64 (temp_fd, off, SEEK_SET), off); + TEST_COMPARE (fcntl64_lockf (temp_fd, LOCK, 1024), 0); + /* Parent process should have ([0, 1024), [2048, INT32_MAX), + [INT32_MAX+1024, INT64_MAX)) ranges locked. */ + + { + struct support_capture_subprocess result; + result = support_capture_subprocess (do_test_child_lockf64, NULL); + support_capture_subprocess_check (&result, "lockf", 0, sc_allow_none); + } + } + + return 0; +} + +#include diff --git a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h index ca6a0d7516..3c15625599 100644 --- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h +++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h @@ -101,7 +101,7 @@ #endif #ifndef F_GETLK -# ifndef __USE_FILE_OFFSET64 +# if !defined(__USE_FILE_OFFSET64) && __TIMESIZE != 64 # define F_GETLK 5 /* Get record locking info. */ # define F_SETLK 6 /* Set record locking info (non-blocking). */ # define F_SETLKW 7 /* Set record locking info (blocking). */