git: 0f5f0e5e56ae - stable/13 - linux(4): Convert flags before use in utimensat.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Jun 2022 19:24:08 UTC
The branch stable/13 has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=0f5f0e5e56aeee139be5654af646f330d7ecdfb0
commit 0f5f0e5e56aeee139be5654af646f330d7ecdfb0
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2021-05-31 19:30:37 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-06-17 19:22:16 +0000
linux(4): Convert flags before use in utimensat.
Differential Revision: https://reviews.freebsd.org/D30487
MFC after: 2 weeks
(cherry picked from commit 8505eb5dd8f743f29e9c93b6814a34f1890e6c41)
---
sys/compat/linux/linux_misc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 98be575b7b6c..cb129179a44d 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -861,6 +861,9 @@ linux_utimensat(struct thread *td, struct linux_utimensat_args *args)
return (0);
}
+ if (args->flags & LINUX_AT_SYMLINK_NOFOLLOW)
+ flags |= AT_SYMLINK_NOFOLLOW;
+
if (!LUSECONVPATH(td)) {
if (args->pathname != NULL) {
return (kern_utimensat(td, dfd, args->pathname,
@@ -873,9 +876,6 @@ linux_utimensat(struct thread *td, struct linux_utimensat_args *args)
else if (args->flags != 0)
return (EINVAL);
- if (args->flags & LINUX_AT_SYMLINK_NOFOLLOW)
- flags |= AT_SYMLINK_NOFOLLOW;
-
if (path == NULL)
error = kern_futimens(td, dfd, timesp, UIO_SYSSPACE);
else {