AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-10 07:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: Fix time64 support for futimesat

Browse Source 
The generic implementation does not support time64 and the default
one return overflow for invalid tv_sec with UTIME_NOW / UTIME_OMIT
(which is valid since tv_sec in such cases is ignored by the
kernel).

Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
kernel).

Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Adhemerval Zanella 2020-07-10 17:54:42 -03:00
parent cb49c65bb5
commit 01f33a9acc
2 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sysdeps/unix/sysv/linux/generic/futimesat.c
View File

@ -1,52 +0,0 @@
/* futimesat -- Change access and modification times of file. Linux version.
Copyright (C) 2005-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
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
<https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <fcntl.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
#include <utime.h>
#include <sys/time.h>
#include <sysdep.h>
/* Change the access time of FILE relative to FD to TVP[0] and
the modification time of FILE to TVP[1]. */
int
futimesat (int fd, const char *file, const struct timeval tvp[2])
{
struct timespec tsp[2];
int result;
if (tvp)
{
if (tvp[0].tv_usec >= 1000000 || tvp[0].tv_usec < 0
|| tvp[1].tv_usec >= 1000000 || tvp[1].tv_usec < 0)
{
__set_errno (EINVAL);
return -1;
}
TIMEVAL_TO_TIMESPEC (&tvp[0], &tsp[0]);
TIMEVAL_TO_TIMESPEC (&tvp[1], &tsp[1]);
}
result = INLINE_SYSCALL (utimensat, 4, fd, file, tvp ? tsp : NULL, 0);
return result;
}

8
sysdeps/unix/sysv/linux/utimensat.c
View File

@ -36,9 +36,13 @@ __utimensat64_helper (int fd, const char *file,
if (ret == 0 || errno != ENOSYS) if (ret == 0 || errno != ENOSYS)
return ret; return ret;
/* For UTIME_NOW and UTIME_OMIT the value of tv_sec field is ignored. */
# define TS_VALID(ns) \
((((ns).tv_nsec == UTIME_NOW || (ns).tv_nsec == UTIME_OMIT) \
|| in_time_t_range ((ns).tv_sec)))
if (tsp64 != NULL if (tsp64 != NULL
&& (! in_time_t_range (tsp64[0].tv_sec) && (!TS_VALID (tsp64[0]) || !TS_VALID (tsp64[1])))
|| ! in_time_t_range (tsp64[1].tv_sec)))
{ {
__set_errno (EOVERFLOW); __set_errno (EOVERFLOW);
return -1; return -1;