mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: fix utimensat

Browse Source 
The glibc function for utimensat glibc returns -EINVAL when the path is null
which is a different behaviour with the syscall.

path can be null because internally the glibc is using utimensat with
path null when implmenting futimens. If path is null, call futimes
instead.

don't try to copy timespec from user if is NULL.

Add configure check for older systems

Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
This commit is contained in:
Riku Voipio 2009-04-21 15:01:51 +03:00 committed by Riku Voipio
parent 74d753ac86
commit ebc996f3b1
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -1285,6 +1285,25 @@ EOF
fi fi
fi fi
# check if utimensat and futimens are supported
utimens=no
cat > $TMPC << EOF
#define _ATFILE_SOURCE
#define _GNU_SOURCE
#include <stddef.h>
#include <fcntl.h>
int main(void)
{
utimensat(AT_FDCWD, "foo", NULL, 0);
futimens(0, NULL);
return 0;
}
EOF
if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
utimens=yes
fi
# Check if tools are available to build documentation. # Check if tools are available to build documentation.
if test "$build_docs" = "yes" -a \( ! -x "`which texi2html 2>/dev/null`" -o ! -x "`which pod2man 2>/dev/null`" \) ; then if test "$build_docs" = "yes" -a \( ! -x "`which texi2html 2>/dev/null`" -o ! -x "`which pod2man 2>/dev/null`" \) ; then
build_docs="no" build_docs="no"
@ -1682,6 +1701,9 @@ fi
if test "$atfile" = "yes" ; then if test "$atfile" = "yes" ; then
echo "#define CONFIG_ATFILE 1" >> $config_h echo "#define CONFIG_ATFILE 1" >> $config_h
fi fi
if test "$utimens" = "yes" ; then
echo "#define CONFIG_UTIMENSAT 1" >> $config_h
fi
if test "$inotify" = "yes" ; then if test "$inotify" = "yes" ; then
echo "#define CONFIG_INOTIFY 1" >> $config_h echo "#define CONFIG_INOTIFY 1" >> $config_h
fi fi

38
linux-user/syscall.c
View File

@ -406,13 +406,6 @@ static int sys_unlinkat(int dirfd, const char *pathname, int flags)
return (unlinkat(dirfd, pathname, flags)); return (unlinkat(dirfd, pathname, flags));
} }
#endif #endif
#ifdef TARGET_NR_utimensat
static int sys_utimensat(int dirfd, const char *pathname,
const struct timespec times[2], int flags)
{
return (utimensat(dirfd, pathname, times, flags));
}
#endif
#else /* !CONFIG_ATFILE */ #else /* !CONFIG_ATFILE */
/* /*
@ -471,12 +464,24 @@ _syscall3(int,sys_symlinkat,const char *,oldpath,
#if defined(TARGET_NR_unlinkat) && defined(__NR_unlinkat) #if defined(TARGET_NR_unlinkat) && defined(__NR_unlinkat)
_syscall3(int,sys_unlinkat,int,dirfd,const char *,pathname,int,flags) _syscall3(int,sys_unlinkat,int,dirfd,const char *,pathname,int,flags)
#endif #endif
#endif /* CONFIG_ATFILE */
#ifdef CONFIG_UTIMENSAT
static int sys_utimensat(int dirfd, const char *pathname,
const struct timespec times[2], int flags)
{
if (pathname == NULL)
return futimens(dirfd, times);
else
return utimensat(dirfd, pathname, times, flags);
}
#else
#if defined(TARGET_NR_utimensat) && defined(__NR_utimensat) #if defined(TARGET_NR_utimensat) && defined(__NR_utimensat)
_syscall4(int,sys_utimensat,int,dirfd,const char *,pathname, _syscall4(int,sys_utimensat,int,dirfd,const char *,pathname,
const struct timespec *,tsp,int,flags) const struct timespec *,tsp,int,flags)
#endif #endif
#endif /* CONFIG_UTIMENSAT */
#endif /* CONFIG_ATFILE */
#ifdef CONFIG_INOTIFY #ifdef CONFIG_INOTIFY
#include <sys/inotify.h> #include <sys/inotify.h>
@ -6669,17 +6674,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#if defined(TARGET_NR_utimensat) && defined(__NR_utimensat) #if defined(TARGET_NR_utimensat) && defined(__NR_utimensat)
case TARGET_NR_utimensat: case TARGET_NR_utimensat:
{ {
struct timespec ts[2]; struct timespec *tsp, ts[2];
target_to_host_timespec(ts, arg3); if (!arg3) {
target_to_host_timespec(ts+1, arg3+sizeof(struct target_timespec)); tsp = NULL;
} else {
target_to_host_timespec(ts, arg3);
target_to_host_timespec(ts+1, arg3+sizeof(struct target_timespec));
tsp = ts;
}
if (!arg2) if (!arg2)
ret = get_errno(sys_utimensat(arg1, NULL, ts, arg4)); ret = get_errno(sys_utimensat(arg1, NULL, tsp, arg4));
else { else {
if (!(p = lock_user_string(arg2))) { if (!(p = lock_user_string(arg2))) {
ret = -TARGET_EFAULT; ret = -TARGET_EFAULT;
goto fail; goto fail;
} }
ret = get_errno(sys_utimensat(arg1, path(p), ts, arg4)); ret = get_errno(sys_utimensat(arg1, path(p), tsp, arg4));
unlock_user(p, arg2, 0); unlock_user(p, arg2, 0);
} }
} }