Commit 12fd0d3088d27867be68655bcab2b074f2835f60
Committed by
Al Viro
1 parent
fe6e9c1f25
Exists in
master
and in
4 other branches
[patch for 2.6.26 2/4] vfs: utimensat(): be consistent with utime() for immutabl…
…e and append-only files This patch fixes utimensat() to make its behavior consistent with that of utime()/utimes() when dealing with files marked immutable and append-only. The current utimensat() implementation also returns EPERM if 'times' is non-NULL and the tv_nsec fields are both UTIME_NOW. For consistency, the (times != NULL && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) case should be treated like the traditional utimes() case where 'times' is NULL. That is, the call should succeed for a file marked append-only and should give the error EACCES if the file is marked as immutable. The simple way to do this is to set 'times' to NULL if (times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW). This is also the natural approach, since POSIX.1 semantics consider the times == {{x, UTIME_NOW}, {y, UTIME_NOW}} to be exactly equivalent to the case for times == NULL. (Thanks to Miklos for pointing this out.) Patch 3 in this series relies on the simplification provided by this patch. Acked-by: Miklos Szeredi <miklos@szeredi.hu> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Ulrich Drepper <drepper@redhat.com> Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff
fs/utimes.c
... | ... | @@ -102,6 +102,10 @@ |
102 | 102 | if (error) |
103 | 103 | goto dput_and_out; |
104 | 104 | |
105 | + if (times && times[0].tv_nsec == UTIME_NOW && | |
106 | + times[1].tv_nsec == UTIME_NOW) | |
107 | + times = NULL; | |
108 | + | |
105 | 109 | /* Don't worry, the checks are done in inode_change_ok() */ |
106 | 110 | newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME; |
107 | 111 | if (times) { |