Introduce is_owner_or_cap() to wrap CAP_FOWNER use with fsuid check

[safe/jmp/linux-2.6] / fs / utimes.c

diff --git a/fs/utimes.c b/fs/utimes.c
index 83a7e69..682eb63 100644 (file)
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -106,7 +106,7 @@ 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) && !capable(CAP_FOWNER)) {
+               if (!is_owner_or_cap(inode)) {
                        if (f) {
                                if (!(f->f_mode & FMODE_WRITE))
                                        goto dput_and_out;