From patchwork Wed Feb 23 13:51:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 584791 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1NDxaEa028111 for ; Wed, 23 Feb 2011 13:59:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755577Ab1BWNx3 (ORCPT ); Wed, 23 Feb 2011 08:53:29 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:53140 "EHLO e28smtp07.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755530Ab1BWNxY (ORCPT ); Wed, 23 Feb 2011 08:53:24 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp07.in.ibm.com (8.14.4/8.13.1) with ESMTP id p1NDrHeH002101; Wed, 23 Feb 2011 19:23:17 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p1NDrGkQ3182728; Wed, 23 Feb 2011 19:23:17 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p1NDrBqN017882; Thu, 24 Feb 2011 00:53:14 +1100 Received: from skywalker.ibm.com ([9.77.68.27]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p1NDqS21014791; Thu, 24 Feb 2011 00:53:07 +1100 From: "Aneesh Kumar K.V" To: sfrench@us.ibm.com, agruen@linbit.com, dilger.kernel@dilger.ca, sandeen@redhat.com, tytso@mit.edu, bfields@fieldses.org, jlayton@redhat.com Cc: aneesh.kumar@linux.vnet.ibm.com, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Gruenbacher Subject: [PATCH -V5 08/24] vfs: Add delete child and delete self permission flags Date: Wed, 23 Feb 2011 19:21:55 +0530 Message-Id: <1298469131-16555-9-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1298469131-16555-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1298469131-16555-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 23 Feb 2011 13:59:47 +0000 (UTC) diff --git a/fs/namei.c b/fs/namei.c index b4f7198..1b6dbc9 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -253,7 +253,7 @@ int generic_permission(struct inode *inode, int mask, unsigned int flags, * are used for other things. * * When checking for MAY_APPEND, MAY_CREATE_FILE, MAY_CREATE_DIR, - * MAY_WRITE must also be set in @mask. + * MAY_DELETE_CHILD, MAY_DELETE_SELF, MAY_WRITE must also be set in @mask. */ int inode_permission(struct inode *inode, int mask) { @@ -1944,7 +1944,7 @@ static inline int check_sticky(struct inode *dir, struct inode *inode) return 0; if (dir->i_uid == fsuid) return 0; - return !capable(CAP_FOWNER); + return 1; } /* @@ -1966,30 +1966,42 @@ static inline int check_sticky(struct inode *dir, struct inode *inode) * 10. We don't allow removal of NFS sillyrenamed files; it's handled by * nfs_async_unlink(). */ -static int may_delete(struct inode *dir,struct dentry *victim,int isdir) +static int may_delete(struct inode *dir, struct dentry *victim, + int isdir, int replace) { - int error; + int mask, error, is_sticky; + struct inode *inode = victim->d_inode; - if (!victim->d_inode) + if (!inode) return -ENOENT; BUG_ON(victim->d_parent->d_inode != dir); audit_inode_child(victim, dir); - error = inode_permission(dir, MAY_WRITE | MAY_EXEC); + mask = MAY_WRITE | MAY_EXEC | MAY_DELETE_CHILD; + if (replace) + mask |= S_ISDIR(inode->i_mode) ? + MAY_CREATE_DIR : MAY_CREATE_FILE; + is_sticky = check_sticky(dir, inode); + error = inode_permission(dir, mask); + if ((error || is_sticky) && IS_RICHACL(inode) && + !inode_permission(dir, mask & ~(MAY_WRITE | MAY_DELETE_CHILD)) && + !inode_permission(inode, MAY_DELETE_SELF)) + error = 0; + else if (!error && is_sticky && !capable(CAP_FOWNER)) + error = -EPERM; if (error) return error; if (IS_APPEND(dir)) return -EPERM; - if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)|| - IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode)) + if (IS_APPEND(inode) || IS_IMMUTABLE(inode) || IS_SWAPFILE(inode)) return -EPERM; if (isdir) { - if (!S_ISDIR(victim->d_inode->i_mode)) + if (!S_ISDIR(inode->i_mode)) return -ENOTDIR; if (IS_ROOT(victim)) return -EBUSY; - } else if (S_ISDIR(victim->d_inode->i_mode)) + } else if (S_ISDIR(inode->i_mode)) return -EISDIR; if (IS_DEADDIR(dir)) return -ENOENT; @@ -2824,7 +2836,7 @@ void dentry_unhash(struct dentry *dentry) int vfs_rmdir(struct inode *dir, struct dentry *dentry) { - int error = may_delete(dir, dentry, 1); + int error = may_delete(dir, dentry, 1, 0); if (error) return error; @@ -2911,7 +2923,7 @@ SYSCALL_DEFINE1(rmdir, const char __user *, pathname) int vfs_unlink(struct inode *dir, struct dentry *dentry) { - int error = may_delete(dir, dentry, 0); + int error = may_delete(dir, dentry, 0, 0); if (error) return error; @@ -3304,14 +3316,14 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, if (old_dentry->d_inode == new_dentry->d_inode) return 0; - error = may_delete(old_dir, old_dentry, is_dir); + error = may_delete(old_dir, old_dentry, is_dir, 0); if (error) return error; if (!new_dentry->d_inode) error = may_create(new_dir, new_dentry, is_dir); else - error = may_delete(new_dir, new_dentry, is_dir); + error = may_delete(new_dir, new_dentry, is_dir, 1); if (error) return error; diff --git a/include/linux/fs.h b/include/linux/fs.h index a86afc0..6a6e017 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -64,6 +64,8 @@ struct inodes_stat_t { #define MAY_CHDIR 64 #define MAY_CREATE_FILE 128 #define MAY_CREATE_DIR 256 +#define MAY_DELETE_CHILD 512 +#define MAY_DELETE_SELF 1024 /* * flags in file.f_mode. Note that FMODE_READ and FMODE_WRITE must correspond