Index: sys/compat/linux/linux_misc.c =================================================================== --- sys/compat/linux/linux_misc.c +++ sys/compat/linux/linux_misc.c @@ -895,19 +895,12 @@ struct timeval tv[2], *tvp = NULL; char *fname; int error, dfd; - bool convpath; - convpath = LUSECONVPATH(td); dfd = (args->dfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->dfd; - if (convpath) - LCONVPATHEXIST_AT(td, args->filename, &fname, dfd); if (args->utimes != NULL) { - if ((error = copyin(args->utimes, ltv, sizeof ltv))) { - if (convpath) - LFREEPATH(fname); + if ((error = copyin(args->utimes, ltv, sizeof ltv))) return (error); - } tv[0].tv_sec = ltv[0].tv_sec; tv[0].tv_usec = ltv[0].tv_usec; tv[1].tv_sec = ltv[1].tv_sec; @@ -915,11 +908,13 @@ tvp = tv; } - if (!convpath) { + if (!LUSECONVPATH(td)) { error = kern_utimesat(td, dfd, args->filename, UIO_USERSPACE, tvp, UIO_SYSSPACE); } else { - error = kern_utimesat(td, dfd, fname, UIO_SYSSPACE, tvp, UIO_SYSSPACE); + LCONVPATHEXIST_AT(td, args->filename, &fname, dfd); + error = kern_utimesat(td, dfd, fname, UIO_SYSSPACE, + tvp, UIO_SYSSPACE); LFREEPATH(fname); } return (error);