mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 14:50:05 +00:00
linux: Fix fchmodat with AT_SYMLINK_NOFOLLOW for 64 bit time_t (BZ#29097)
The AT_SYMLINK_NOFOLLOW emulation ues the default 32 bit stat internal calls, which fails with EOVERFLOW if the file constains timestamps beyond 2038. Checked on i686-linux-gnu.
This commit is contained in:
parent
6f043e0ee7
commit
118a2aee07
@ -83,16 +83,17 @@ tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \
|
|||||||
tst-ftw-bz28126
|
tst-ftw-bz28126
|
||||||
|
|
||||||
tests-time64 := \
|
tests-time64 := \
|
||||||
|
tst-fcntl-time64 \
|
||||||
|
tst-fts-time64 \
|
||||||
tst-futimens-time64 \
|
tst-futimens-time64 \
|
||||||
tst-futimes-time64\
|
tst-futimes-time64\
|
||||||
tst-fts-time64 \
|
tst-futimesat-time64 \
|
||||||
|
tst-lchmod-time64 \
|
||||||
tst-lutimes-time64 \
|
tst-lutimes-time64 \
|
||||||
tst-stat-time64 \
|
tst-stat-time64 \
|
||||||
tst-futimesat-time64 \
|
|
||||||
tst-utime-time64 \
|
tst-utime-time64 \
|
||||||
tst-utimensat-time64 \
|
tst-utimensat-time64 \
|
||||||
tst-utimes-time64 \
|
tst-utimes-time64 \
|
||||||
tst-fcntl-time64 \
|
|
||||||
# tests-time64
|
# tests-time64
|
||||||
|
|
||||||
# Likewise for statx, but we do not need static linking here.
|
# Likewise for statx, but we do not need static linking here.
|
||||||
@ -136,6 +137,7 @@ CFLAGS-close.c += -fexceptions -fasynchronous-unwind-tables
|
|||||||
|
|
||||||
CFLAGS-test-stat.c += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
|
CFLAGS-test-stat.c += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
|
||||||
CFLAGS-test-lfs.c += -D_LARGEFILE64_SOURCE
|
CFLAGS-test-lfs.c += -D_LARGEFILE64_SOURCE
|
||||||
|
CFLAGS-tst-lchmod.c += -D_FILE_OFFSET_BITS=64
|
||||||
|
|
||||||
test-stat2-ARGS = Makefile . $(objpfx)test-stat2
|
test-stat2-ARGS = Makefile . $(objpfx)test-stat2
|
||||||
|
|
||||||
|
2
io/tst-lchmod-time64.c
Normal file
2
io/tst-lchmod-time64.c
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#define CHECK_TIME64
|
||||||
|
#include "tst-lchmod.c"
|
@ -66,10 +66,27 @@ select_path (bool do_relative_path, const char *full_path, const char *relative_
|
|||||||
return full_path;
|
return full_path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_file_time_to_y2038 (const char *fname, int flags)
|
||||||
|
{
|
||||||
|
#ifdef CHECK_TIME64
|
||||||
|
/* Y2038 threshold plus 1 second. */
|
||||||
|
const struct timespec ts[] = { { 0x80000001LL, 0}, { 0x80000001LL } };
|
||||||
|
TEST_VERIFY_EXIT (utimensat (AT_FDCWD, fname, ts, flags) == 0);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
test_1 (bool do_relative_path, int (*chmod_func) (int fd, const char *, mode_t, int))
|
test_1 (bool do_relative_path, int (*chmod_func) (int fd, const char *, mode_t, int))
|
||||||
{
|
{
|
||||||
char *tempdir = support_create_temp_directory ("tst-lchmod-");
|
char *tempdir = support_create_temp_directory ("tst-lchmod-");
|
||||||
|
#ifdef CHECK_TIME64
|
||||||
|
if (!support_path_support_time64 (tempdir))
|
||||||
|
{
|
||||||
|
puts ("info: test skipped, filesystem does not support 64 bit time_t");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
char *path_dangling = xasprintf ("%s/dangling", tempdir);
|
char *path_dangling = xasprintf ("%s/dangling", tempdir);
|
||||||
char *path_file = xasprintf ("%s/file", tempdir);
|
char *path_file = xasprintf ("%s/file", tempdir);
|
||||||
@ -93,9 +110,12 @@ test_1 (bool do_relative_path, int (*chmod_func) (int fd, const char *, mode_t,
|
|||||||
xsymlink ("loop", path_loop);
|
xsymlink ("loop", path_loop);
|
||||||
xsymlink ("target-does-not-exist", path_dangling);
|
xsymlink ("target-does-not-exist", path_dangling);
|
||||||
|
|
||||||
|
update_file_time_to_y2038 (path_file, 0);
|
||||||
|
update_file_time_to_y2038 (path_to_file, AT_SYMLINK_NOFOLLOW);
|
||||||
|
|
||||||
/* Check that the modes do not collide with what we will use in the
|
/* Check that the modes do not collide with what we will use in the
|
||||||
test. */
|
test. */
|
||||||
struct stat64 st;
|
struct stat st;
|
||||||
xstat (path_file, &st);
|
xstat (path_file, &st);
|
||||||
TEST_VERIFY ((st.st_mode & 0777) != 1);
|
TEST_VERIFY ((st.st_mode & 0777) != 1);
|
||||||
xlstat (path_to_file, &st);
|
xlstat (path_to_file, &st);
|
||||||
|
@ -48,8 +48,8 @@ fchmodat (int fd, const char *file, mode_t mode, int flag)
|
|||||||
|
|
||||||
/* Use fstatat because fstat does not work on O_PATH descriptors
|
/* Use fstatat because fstat does not work on O_PATH descriptors
|
||||||
before Linux 3.6. */
|
before Linux 3.6. */
|
||||||
struct stat64 st;
|
struct __stat64_t64 st;
|
||||||
if (__fstatat64 (pathfd, "", &st, AT_EMPTY_PATH) != 0)
|
if (__fstatat64_time64 (pathfd, "", &st, AT_EMPTY_PATH) != 0)
|
||||||
{
|
{
|
||||||
__close_nocancel (pathfd);
|
__close_nocancel (pathfd);
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user