Messages in this thread Patch in this message | | | Date | Sat, 03 May 2008 14:23:45 +0200 | From | Oliver Pinter <> | Subject | [OP] 02-vfs-utimes-Honour-CAP_FOWNER-when-times-NULL.patch added to queue-2.6.22.23-op1 |
| |
Your patch added to queue-2.6.22.23-op1. If anyone has any objections, please let us know.
http://repo.or.cz/w/linux-2.6.22.y-op-patches.git git://repo.or.cz/linux-2.6.22.y-op-patches.git
---
From 5b37696fda07b8acf37beba3853f83106397ccdf Mon Sep 17 00:00:00 2001 From: Satyam Sharma <ssatyam@cse.iitk.ac.in> Date: Tue, 17 Jul 2007 00:24:23 +0530 Subject: [PATCH] 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>
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 @@ 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) { + if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) { if (f) { if (!(f->f_mode & FMODE_WRITE)) goto dput_and_out;
| |