---

yaml --- r: 58254 b: refs/heads/master c: 1e5de28 h: refs/heads/master v: v3
git-mirror · Jul 8, 2007 · b05bb4d · b05bb4d
1 parent 0c37c0f
commit b05bb4d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e99325b462ba18075768582621af74a6b79d2a5
+refs/heads/master: 1e5de2837c166535f9bb4232bfe97ea1f9fc7a1c
diff --git a/trunk/fs/utimes.c b/trunk/fs/utimes.c
@@ -106,9 +106,16 @@ long do_utimes(int dfd, char __user *filename, struct timespec *times, int flags
                 if (IS_IMMUTABLE(inode))
                         goto dput_and_out;
 
-		if (current->fsuid != inode->i_uid &&
-		    (error = vfs_permission(&nd, MAY_WRITE)) != 0)
-			goto dput_and_out;
+		if (current->fsuid != inode->i_uid) {
+			if (f) {
+				if (!(f->f_mode & FMODE_WRITE))
+					goto dput_and_out;
+			} else {
+				error = vfs_permission(&nd, MAY_WRITE);
+				if (error)
+					goto dput_and_out;
+			}
+		}
 	}
 	mutex_lock(&inode->i_mutex);
 	error = notify_change(dentry, &newattrs);