mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +08:00
06ab719d30
This patch fixes the OFD ("file private") locks for architectures that
support non-LFS flock definition (__USE_FILE_OFFSET64 not defined). The
issue in this case is both F_OFD_{GETLK,SETLK,SETLKW} and
F_{SET,GET}L{W}K64 expects a flock64 argument and when using old
F_OFD_* flags with a non LFS flock argument the kernel might interpret
the underlying data wrongly. Kernel idea originally was to avoid using
such flags in non-LFS syscall, but since GLIBC uses fcntl with LFS
semantic as default it is possible to provide the functionality and
avoid the bogus struct kernel passing by adjusting the struct manually
for the required flags.
The idea follows other LFS interfaces that provide two symbols:
1. A new LFS fcntl64 is added on default ABI with the usual macros to
select it for FILE_OFFSET_BITS=64.
2. The Linux non-LFS fcntl use a stack allocated struct flock64 for
F_OFD_{GETLK,SETLK,SETLKW} copy the results on the user provided
struct.
3. Keep a compat symbol with old broken semantic for architectures
that do not define __OFF_T_MATCHES_OFF64_T.
So for architectures which defines __USE_FILE_OFFSET64, fcntl64 will
aliased to fcntl and no adjustment would be required. So to actually
use F_OFD_* with LFS support the source must be built with LFS support
(_FILE_OFFSET_BITS=64).
Also F_OFD_SETLKW command is handled a cancellation point, as for
F_SETLKW{64}.
Checked on x86_64-linux-gnu and i686-linux-gnu.
[BZ #20251]
* NEWS: Mention fcntl64 addition.
* csu/check_fds.c: Replace __fcntl_nocancel by __fcntl64_nocancel.
* login/utmp_file.c: Likewise.
* sysdeps/posix/fdopendir.c: Likewise.
* sysdeps/posix/opendir.c: Likewise.
* sysdeps/unix/pt-fcntl.c: Likewise.
* include/fcntl.h (__libc_fcntl64, __fcntl64,
__fcntl64_nocancel_adjusted): New prototype.
(__fcntl_nocancel_adjusted): Remove prototype.
* io/Makefile (routines): Add fcntl64.
(CFLAGS-fcntl64.c): New rule.
* io/Versions [GLIBC_2.28] (fcntl64): New symbol.
[GLIBC_PRIVATE] (__libc_fcntl): Rename to __libc_fcntl64.
* io/fcntl.h (fcntl64): Add prototype and redirect if
__USE_FILE_OFFSET64 is defined.
* io/fcntl64.c: New file.
* manual/llio.text: Add a note for which commands fcntl acts a
cancellation point.
* nptl/Makefile (CFLAGS-fcntl64.c): New rule.
* sysdeps/mach/hurd/fcntl.c: Alias fcntl to fcntl64 symbols.
* sysdeps/mach/hurd/i386/libc.abilist [GLIBC_2.28] (fcntl, fcntl64):
New symbols.
* sysdeps/unix/sysv/linux/fcntl.c (__libc_fcntl): Fix F_GETLK64,
F_OFD_GETLK, F_SETLK64, F_SETLKW64, F_OFD_SETLK, and F_OFD_SETLKW for
non-LFS case.
* sysdeps/unix/sysv/linux/fcntl64.c: New file.
* sysdeps/unix/sysv/linux/fcntl_nocancel.c (__fcntl_nocancel): Rename
to __fcntl64_nocancel.
(__fcntl_nocancel_adjusted): Rename to __fcntl64_nocancel_adjusted.
* sysdeps/unix/sysv/linux/not-cancel.h (__fcntl_nocancel): Rename
to __fcntl64_nocancel.
* sysdeps/unix/sysv/linux/tst-ofdlocks.c: New file.
* sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c: Likewise.
* sysdeps/unix/sysv/linux/Makefile (tests): Add tst-ofdlocks.
(tests-internal): Add tst-ofdlocks-compat.
* sysdeps/unix/sysv/linux/aarch64/libc.abilist [GLIBC_2.28]
(fcntl64): New symbol.
* sysdeps/unix/sysv/linux/alpha/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/ia64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist: Likewise.
* sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/arm/libc.abilist [GLIBC_2.28] (fcntl,
fcntl64): Likewise.
* sysdeps/unix/sysv/linux/hppa/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/i386/libc.abilis: Likewise.
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/microblaze/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/nios2/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist:
Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist:
Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/sh/libc.abilist: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist: Likewise.
126 lines
4.7 KiB
Makefile
126 lines
4.7 KiB
Makefile
# Copyright (C) 1992-2018 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
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Sub-makefile for I/O portion of the library.
|
|
#
|
|
subdir := io
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \
|
|
sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \
|
|
poll.h sys/poll.h bits/poll.h bits/fcntl2.h bits/poll2.h \
|
|
utime.h ftw.h fts.h sys/sendfile.h
|
|
|
|
routines := \
|
|
utime \
|
|
mkfifo mkfifoat \
|
|
stat fstat lstat stat64 fstat64 lstat64 fstatat fstatat64 \
|
|
xstat fxstat lxstat xstat64 fxstat64 lxstat64 \
|
|
mknod mknodat xmknod xmknodat \
|
|
fxstatat fxstatat64 \
|
|
statfs fstatfs statfs64 fstatfs64 \
|
|
statvfs fstatvfs statvfs64 fstatvfs64 \
|
|
umask chmod fchmod lchmod fchmodat \
|
|
mkdir mkdirat \
|
|
open open_2 open64 open64_2 openat openat_2 openat64 openat64_2 \
|
|
read write lseek lseek64 access euidaccess faccessat \
|
|
fcntl fcntl64 flock lockf lockf64 \
|
|
close dup dup2 dup3 pipe pipe2 \
|
|
creat creat64 \
|
|
chdir fchdir \
|
|
getcwd getwd getdirname \
|
|
chown fchown lchown fchownat \
|
|
ttyname ttyname_r isatty \
|
|
link linkat symlink symlinkat readlink readlinkat \
|
|
unlink unlinkat rmdir \
|
|
ftw ftw64 fts fts64 poll ppoll \
|
|
posix_fadvise posix_fadvise64 \
|
|
posix_fallocate posix_fallocate64 \
|
|
sendfile sendfile64 copy_file_range \
|
|
utimensat futimens
|
|
|
|
# These routines will be omitted from the libc shared object.
|
|
# Instead the static object files will be included in a special archive
|
|
# linked against when the shared library will be used.
|
|
static-only-routines = stat fstat lstat stat64 fstat64 lstat64 \
|
|
fstatat fstatat64 mknod mknodat
|
|
|
|
others := pwd
|
|
test-srcs := ftwtest
|
|
tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \
|
|
tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3 bug-ftw4 tst-statvfs \
|
|
tst-openat tst-unlinkat tst-fstatat tst-futimesat \
|
|
tst-renameat tst-fchownat tst-fchmodat tst-faccessat \
|
|
tst-symlinkat tst-linkat tst-readlinkat tst-mkdirat \
|
|
tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5 \
|
|
tst-posix_fallocate tst-posix_fallocate64 \
|
|
tst-fts tst-fts-lfs tst-open-tmpfile \
|
|
tst-copy_file_range tst-getcwd-abspath \
|
|
|
|
# This test includes the compat implementation of copy_file_range,
|
|
# which uses internal, unexported libc functions.
|
|
tests-static += tst-copy_file_range-compat
|
|
tests-internal += tst-copy_file_range-compat
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
tests-special += $(objpfx)ftwtest.out
|
|
endif
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-open.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-open64.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-creat.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-creat64.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-fcntl.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-fcntl64.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-poll.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-ppoll.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-lockf.c += -fexceptions
|
|
CFLAGS-statfs.c += -fexceptions
|
|
CFLAGS-fstatfs.c += -fexceptions
|
|
CFLAGS-statvfs.c += -fexceptions
|
|
CFLAGS-fstatvfs.c += -fexceptions
|
|
CFLAGS-fts.c += -Wno-uninitialized $(uses-callbacks) -fexceptions
|
|
CFLAGS-fts64.c += -Wno-uninitialized $(uses-callbacks) -fexceptions
|
|
CFLAGS-ftw.c += $(uses-callbacks) -fexceptions
|
|
CFLAGS-ftw64.c += $(uses-callbacks) -fexceptions
|
|
CFLAGS-lockf.c += -fexceptions
|
|
CFLAGS-posix_fallocate.c += -fexceptions
|
|
CFLAGS-posix_fallocate64.c += -fexceptions
|
|
CFLAGS-fallocate.c += -fexceptions
|
|
CFLAGS-fallocate64.c += -fexceptions
|
|
CFLAGS-read.c += -fexceptions
|
|
CFLAGS-write.c += -fexceptions
|
|
|
|
CFLAGS-test-stat.c += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
|
|
CFLAGS-test-lfs.c += -D_LARGEFILE64_SOURCE
|
|
|
|
test-stat2-ARGS = Makefile . $(objpfx)test-stat2
|
|
|
|
tst-statvfs-ARGS = $(objpfx)tst-statvfs tst-statvfs.c /tmp
|
|
|
|
tst-open-tmpfile-ARGS = --test-dir=$(objpfx)
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
$(objpfx)ftwtest.out: ftwtest-sh $(objpfx)ftwtest
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@; \
|
|
$(evaluate-test)
|
|
endif
|