X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Futimes.c;h=682eb63b20ad3c4c7452870c3d9e6e832aea21e0;hb=0fd5355470ea40355b8af76d01748ec7b9926d4d;hp=480f7c8c29da13ee10941f5cf5e560faffbde0a6;hpb=2c4f365ad2361c93c097e958b2b0a7a112750228;p=linux-2.6

diff --git a/fs/utimes.c b/fs/utimes.c
index 480f7c8c29..682eb63b20 100644
--- a/fs/utimes.c
+++ b/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 (!is_owner_or_cap(inode)) {
+			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);