The patch titled
lutimesat: extend do_utimes() with flags
has been added to the -mm tree. Its filename is
lutimesat-extend-do_utimes-with-flags.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: lutimesat: extend do_utimes() with flags
From: Alexey Dobriyan <adobriyan@xxxxxxxxxx>
Passing AT_SYMLINK_NOFOLLOW will stop following symlinks. Pass 0 to get
usual behaviour.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/alpha/kernel/osf_sys.c | 2 +-
arch/sparc64/kernel/sys_sparc32.c | 2 +-
fs/compat.c | 4 ++--
fs/utimes.c | 15 ++++++++++-----
include/linux/time.h | 2 +-
5 files changed, 15 insertions(+), 10 deletions(-)
diff -puN arch/alpha/kernel/osf_sys.c~lutimesat-extend-do_utimes-with-flags arch/alpha/kernel/osf_sys.c
--- a/arch/alpha/kernel/osf_sys.c~lutimesat-extend-do_utimes-with-flags
+++ a/arch/alpha/kernel/osf_sys.c
@@ -963,7 +963,7 @@ osf_utimes(char __user *filename, struct
return -EFAULT;
}
- return do_utimes(AT_FDCWD, filename, tvs ? ktvs : NULL);
+ return do_utimes(AT_FDCWD, filename, tvs ? ktvs : NULL, 0);
}
#define MAX_SELECT_SECONDS \
diff -puN arch/sparc64/kernel/sys_sparc32.c~lutimesat-extend-do_utimes-with-flags arch/sparc64/kernel/sys_sparc32.c
--- a/arch/sparc64/kernel/sys_sparc32.c~lutimesat-extend-do_utimes-with-flags
+++ a/arch/sparc64/kernel/sys_sparc32.c
@@ -783,7 +783,7 @@ asmlinkage long sys32_utimes(char __user
return -EFAULT;
}
- return do_utimes(AT_FDCWD, filename, (tvs ? &ktvs[0] : NULL));
+ return do_utimes(AT_FDCWD, filename, (tvs ? &ktvs[0] : NULL), 0);
}
/* These are here just in case some old sparc32 binary calls it. */
diff -puN fs/compat.c~lutimesat-extend-do_utimes-with-flags fs/compat.c
--- a/fs/compat.c~lutimesat-extend-do_utimes-with-flags
+++ a/fs/compat.c
@@ -87,7 +87,7 @@ asmlinkage long compat_sys_utime(char __
tv[0].tv_usec = 0;
tv[1].tv_usec = 0;
}
- return do_utimes(AT_FDCWD, filename, t ? tv : NULL);
+ return do_utimes(AT_FDCWD, filename, t ? tv : NULL, 0);
}
asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename, struct compat_timeval __user *t)
@@ -101,7 +101,7 @@ asmlinkage long compat_sys_futimesat(uns
get_user(tv[1].tv_usec, &t[1].tv_usec))
return -EFAULT;
}
- return do_utimes(dfd, filename, t ? tv : NULL);
+ return do_utimes(dfd, filename, t ? tv : NULL, 0);
}
asmlinkage long compat_sys_utimes(char __user *filename, struct compat_timeval __user *t)
diff -puN fs/utimes.c~lutimesat-extend-do_utimes-with-flags fs/utimes.c
--- a/fs/utimes.c~lutimesat-extend-do_utimes-with-flags
+++ a/fs/utimes.c
@@ -31,7 +31,7 @@ asmlinkage long sys_utime(char __user *
tv[0].tv_usec = 0;
tv[1].tv_usec = 0;
}
- return do_utimes(AT_FDCWD, filename, times ? tv : NULL);
+ return do_utimes(AT_FDCWD, filename, times ? tv : NULL, 0);
}
#endif
@@ -40,14 +40,19 @@ asmlinkage long sys_utime(char __user *
* must be owner or have write permission.
* Else, update from *times, must be owner or super user.
*/
-long do_utimes(int dfd, char __user *filename, struct timeval *times)
+long do_utimes(int dfd, char __user *filename, struct timeval *times, int flags)
{
- int error;
+ int error = -EINVAL;
struct nameidata nd;
struct inode * inode;
struct iattr newattrs;
+ int follow;
- error = __user_walk_fd(dfd, filename, LOOKUP_FOLLOW, &nd);
+ if ((flags & ~AT_SYMLINK_NOFOLLOW) != 0)
+ goto out;
+
+ follow = (flags & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW;
+ error = __user_walk_fd(dfd, filename, follow, &nd);
if (error)
goto out;
@@ -93,7 +98,7 @@ asmlinkage long sys_futimesat(int dfd, c
if (utimes && copy_from_user(×, utimes, sizeof(times)))
return -EFAULT;
- return do_utimes(dfd, filename, utimes ? times : NULL);
+ return do_utimes(dfd, filename, utimes ? times : NULL, 0);
}
asmlinkage long sys_utimes(char __user *filename, struct timeval __user *utimes)
diff -puN include/linux/time.h~lutimesat-extend-do_utimes-with-flags include/linux/time.h
--- a/include/linux/time.h~lutimesat-extend-do_utimes-with-flags
+++ a/include/linux/time.h
@@ -109,7 +109,7 @@ extern void do_gettimeofday(struct timev
extern int do_settimeofday(struct timespec *tv);
extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz);
#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
-extern long do_utimes(int dfd, char __user *filename, struct timeval *times);
+extern long do_utimes(int dfd, char __user *filename, struct timeval *times, int flags);
struct itimerval;
extern int do_setitimer(int which, struct itimerval *value,
struct itimerval *ovalue);
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxxx are
fix-null-nsproxy-dereference-in-proc-mounts.patch
core-dumping-unreadable-binaries-via-pt_interp.patch
sysctl_ms_jiffies-fix-oldlen-semantics.patch
consolidate-default-sched_clock.patch
fix-rmmod-read-write-races-in-proc-entries.patch
consolidate-bust_spinlocks.patch
extract-and-use-wake_up_klogd.patch
introduce-and-use-get_task_mnt_ns.patch
introduce-and-use-get_task_mnt_ns-tweaks.patch
lutimesat-simplify-utime2.patch
lutimesat-extend-do_utimes-with-flags.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
