commit 5b37696fda07b8acf37beba3853f83106397ccdf
author Satyam Sharma <ssatyam@cse.iitk.ac.in> Tue Jul 17 00:24:23 2007 +0530
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Jul 16 12:14:08 2007 -0700
tree 5f85c318eb7d76ce05adf504c4e209978a70ad47
parent 9793c3266755b4cae8915982825b2c07cd12e1c6

utime(s): Honour CAP_FOWNER when times==NULL

do_utimes() does not honour CAP_FOWNER when times==NULL.
Trivial and obvious one-line fix.

Signed-off-by: Satyam Sharma <ssatyam@cse.iitk.ac.in>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

fs/utimes.c

diff --git a/fs/utimes.c b/fs/utimes.c
index b3c8895..83a7e69 100644
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -106,7 +106,7 @@
                 if (IS_IMMUTABLE(inode))
                         goto dput_and_out;
 
-		if (current->fsuid != inode->i_uid) {
+		if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) {
 			if (f) {
 				if (!(f->f_mode & FMODE_WRITE))
 					goto dput_and_out;