From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Hansen Subject: [RFC][PATCH 24/27] elevate mount count for extended attributes Date: Wed, 07 Jun 2006 17:10:37 -0700 Message-ID: <20060608001037.26C3EB3E@localhost.localdomain> References: <20060608001013.0D041507@localhost.localdomain> Cc: herbert@13thfloor.at, viro@ftp.linux.org.uk, hch@infradead.org, trond.myklebust@fys.uio.no, Dave Hansen Return-path: Received: from e31.co.us.ibm.com ([32.97.110.149]:62098 "EHLO e31.co.us.ibm.com") by vger.kernel.org with ESMTP id S932488AbWFHAKm (ORCPT ); Wed, 7 Jun 2006 20:10:42 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e31.co.us.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id k580AgBh027133 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Jun 2006 20:10:42 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.6/NCO/VER7.0) with ESMTP id k580AffT291808 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 7 Jun 2006 18:10:41 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id k580AeUg009080 for ; Wed, 7 Jun 2006 18:10:41 -0600 To: linux-fsdevel@vger.kernel.org In-Reply-To: <20060608001013.0D041507@localhost.localdomain> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org This basically audits the callers of xattr_permission(), which calls permission() itself. Signed-off-by: Dave Hansen --- fs/namei.c | 0 lxc-dave/fs/nfsd/nfs4proc.c | 7 ++++++- lxc-dave/fs/xattr.c | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff -puN fs/xattr.c~xattr fs/xattr.c --- lxc/fs/xattr.c~xattr 2006-06-07 16:53:27.000000000 -0700 +++ lxc-dave/fs/xattr.c 2006-06-07 16:53:27.000000000 -0700 @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -210,7 +211,11 @@ sys_setxattr(char __user *path, char __u error = user_path_walk(path, &nd); if (error) return error; + error = mnt_want_write(nd.mnt); + if (error) + return error; error = setxattr(nd.dentry, name, value, size, flags); + mnt_drop_write(nd.mnt); path_release(&nd); return error; } @@ -225,7 +230,11 @@ sys_lsetxattr(char __user *path, char __ error = user_path_walk_link(path, &nd); if (error) return error; + error = mnt_want_write(nd.mnt); + if (error) + return error; error = setxattr(nd.dentry, name, value, size, flags); + mnt_drop_write(nd.mnt); path_release(&nd); return error; } @@ -241,9 +250,14 @@ sys_fsetxattr(int fd, char __user *name, f = fget(fd); if (!f) return error; + error = mnt_want_write(f->f_vfsmnt); + if (error) + goto out_fput; dentry = f->f_dentry; audit_inode(NULL, dentry->d_inode, 0); error = setxattr(dentry, name, value, size, flags); + mnt_drop_write(f->f_vfsmnt); +out_fput: fput(f); return error; } diff -puN fs/nfsd/vfs.c~xattr fs/nfsd/vfs.c diff -puN fs/nfsd/nfs4proc.c~xattr fs/nfsd/nfs4proc.c --- lxc/fs/nfsd/nfs4proc.c~xattr 2006-06-07 16:53:27.000000000 -0700 +++ lxc-dave/fs/nfsd/nfs4proc.c 2006-06-07 16:53:27.000000000 -0700 @@ -604,13 +604,18 @@ nfsd4_setattr(struct svc_rqst *rqstp, st return status; } } + status = mnt_want_write(current_fh->fh_export->ex_mnt); + if (status) + return status; status = nfs_ok; if (setattr->sa_acl != NULL) status = nfsd4_set_nfs4_acl(rqstp, current_fh, setattr->sa_acl); if (status) - return status; + goto out; status = nfsd_setattr(rqstp, current_fh, &setattr->sa_iattr, 0, (time_t)0); +out: + mnt_drop_write(current_fh->fh_export->ex_mnt); return status; } diff -puN fs/namei.c~xattr fs/namei.c _