BME 0.06.1 nameidata propagation
Subsystems (4)
PATCH 4/6 BME 0.06.1 nameidata propagation
this is a rewrite of the previous co0.01 which introduced the mnt_may_* functions (as generalized approach)
best,
Herbert
;
; Bind Mount Extensions
;
; This part propagates the nameidata into the relevant vfs_*() ; to allow for proper checks via permission()
; it replaces the co0.01 part from bme0.06
;
; Copyright (C) 2003-2005 Herbert Pötzl <[email protected]> ;
; Changelog:
;
; 0.01 - initial version
;
; this patch is free software; you can redistribute it and/or ; modify it under the terms of the GNU General Public License ; as published by the Free Software Foundation; either version 2 ; of the License, or (at your option) any later version. ;
; this patch is distributed in the hope that it will be useful, ; but WITHOUT ANY WARRANTY; without even the implied warranty of ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ; GNU General Public License for more details.
;
fs/namei.c +35 -25
@@ -1119,7 +1119,8 @@ static inline int check_sticky(struct in* 10. We don't allow removal of NFS sillyrenamed files; it's handled by * nfs_async_unlink(). */ -static inline int may_delete (struct inode *dir,struct dentry *victim,int isdir) +static inline int may_delete (struct inode *dir,struct dentry *victim, +int isdir,struct nameidata *nd) {int error;
@@ -1128,7 +1129,7 @@ static inline int may_delete(struct inodBUG_ON (victim->d_parent->d_inode != dir); - error =permission (dir,MAY_WRITE |MAY_EXEC ,NULL ); + error =permission (dir,MAY_WRITE |MAY_EXEC , nd);if (error)return error;if (IS_APPEND (dir))
@@ -1537,9 +1538,10 @@ fail:return dentry; } -int vfs_mknod (struct inode *dir,struct dentry *dentry,int mode,dev_t dev) +int vfs_mknod (struct inode *dir,struct dentry *dentry, +int mode,dev_t dev,struct nameidata *nd) { -int error =may_create (dir, dentry,NULL ); +int error =may_create (dir, dentry, nd);if (error)return error;
@@ -1581,7 +1583,6 @@ asmlinkage long sys_mknod(const char __u goto out; dentry =lookup_create (&nd,0 ); error =PTR_ERR (dentry); -if (!IS_POSIXACL (nd.dentry->d_inode)) mode &= ~current->fs->umask;if (!IS_ERR (dentry)) {
@@ -1590,11 +1591,12 @@ asmlinkage long sys_mknod(const char __u error =vfs_create (nd.dentry->d_inode,dentry,mode,&nd);break ;case S_IFCHR :case S_IFBLK : - error =vfs_mknod (nd.dentry->d_inode,dentry,mode, -new_decode_dev (dev)); + error =vfs_mknod (nd.dentry->d_inode, dentry, mode, +new_decode_dev (dev), &nd);break ;case S_IFIFO :case S_IFSOCK : - error =vfs_mknod (nd.dentry->d_inode,dentry,mode,0 ); + error =vfs_mknod (nd.dentry->d_inode, dentry, mode, +0 , &nd);break ;case S_IFDIR : error = -EPERM ;
@@ -1612,9 +1614,10 @@ out:return error; } -int vfs_mkdir (struct inode *dir,struct dentry *dentry,int mode) +int vfs_mkdir (struct inode *dir,struct dentry *dentry, +int mode,struct nameidata *nd) { -int error =may_create (dir, dentry,NULL ); +int error =may_create (dir, dentry, nd);if (error)return error;
@@ -1655,7 +1658,8 @@ asmlinkage long sys_mkdir(const char __uif (!IS_ERR (dentry)) {if (!IS_POSIXACL (nd.dentry->d_inode)) mode &= ~current->fs->umask; - error =vfs_mkdir (nd.dentry->d_inode, dentry, mode); + error =vfs_mkdir (nd.dentry->d_inode, dentry, + mode, &nd);dput (dentry); }up (&nd.dentry->d_inode->i_sem);
@@ -1699,9 +1703,10 @@ void dentry_unhash(struct dentry *dentryspin_unlock (&dcache_lock); } -int vfs_rmdir (struct inode *dir,struct dentry *dentry) +int vfs_rmdir (struct inode *dir,struct dentry *dentry, +struct nameidata *nd) { -int error =may_delete (dir, dentry,1 ); +int error =may_delete (dir, dentry,1 , nd);if (error)return error;
@@ -1763,7 +1768,7 @@ asmlinkage long sys_rmdir(const char __u dentry =lookup_hash (&nd.last, nd.dentry); error =PTR_ERR (dentry);if (!IS_ERR (dentry)) { - error =vfs_rmdir (nd.dentry->d_inode, dentry); + error =vfs_rmdir (nd.dentry->d_inode, dentry, &nd);dput (dentry); }up (&nd.dentry->d_inode->i_sem);
@@ -1774,9 +1779,10 @@ exit:return error; } -int vfs_unlink (struct inode *dir,struct dentry *dentry) +int vfs_unlink (struct inode *dir,struct dentry *dentry, +struct nameidata *nd) { -int error =may_delete (dir, dentry,0 ); +int error =may_delete (dir, dentry,0 , nd);if (error)return error;
@@ -1838,7 +1844,7 @@ asmlinkage long sys_unlink(const char __ inode = dentry->d_inode;if (inode)atomic_inc (&inode->i_count); - error =vfs_unlink (nd.dentry->d_inode, dentry); + error =vfs_unlink (nd.dentry->d_inode, dentry, &nd); exit2:dput (dentry); }
@@ -1857,9 +1863,10 @@ slashes: goto exit2; } -int vfs_symlink (struct inode *dir,struct dentry *dentry,const char *oldname,int mode) +int vfs_symlink (struct inode *dir,struct dentry *dentry, +const char *oldname,int mode,struct nameidata *nd) { -int error =may_create (dir, dentry,NULL ); +int error =may_create (dir, dentry, nd);if (error)return error;
@@ -1901,7 +1908,8 @@ asmlinkage long sys_symlink(const char _ dentry =lookup_create (&nd,0 ); error =PTR_ERR (dentry);if (!IS_ERR (dentry)) { - error =vfs_symlink (nd.dentry->d_inode, dentry, from,S_IALLUGO ); + error =vfs_symlink (nd.dentry->d_inode, dentry, + from,S_IALLUGO , &nd);dput (dentry); }up (&nd.dentry->d_inode->i_sem);
@@ -1913,7 +1921,8 @@ out:return error; } -int vfs_link (struct dentry *old_dentry,struct inode *dir,struct dentry *new_dentry) +int vfs_link (struct dentry *old_dentry,struct inode *dir, +struct dentry *new_dentry,struct nameidata *nd) {struct inode *inode = old_dentry->d_inode;int error;
@@ -1921,7 +1930,7 @@ int vfs_link(struct dentry *old_dentry,if (!inode)return -ENOENT ; - error =may_create (dir, new_dentry,NULL ); + error =may_create (dir, new_dentry, nd);if (error)return error;
@@ -1985,7 +1994,8 @@ asmlinkage long sys_link(const char __us new_dentry =lookup_create (&nd,0 ); error =PTR_ERR (new_dentry);if (!IS_ERR (new_dentry)) { - error =vfs_link (old_nd.dentry, nd.dentry->d_inode, new_dentry); + error =vfs_link (old_nd.dentry, nd.dentry->d_inode, + new_dentry, &nd);dput (new_dentry); }up (&nd.dentry->d_inode->i_sem);
@@ -2115,14 +2125,14 @@ int vfs_rename(struct inode *old_dir, stif (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,NULL );if (error)return error;if (!new_dentry->d_inode) error =may_create (new_dir, new_dentry,NULL );else - error =may_delete (new_dir, new_dentry, is_dir); + error =may_delete (new_dir, new_dentry, is_dir,NULL );if (error)return error;
fs/nfsd/vfs.c +9 -7
@@ -1115,13 +1115,13 @@ nfsd_create(struct svc_rqst *rqstp, stru err =vfs_create (dirp, dchild, iap->ia_mode,NULL );break ;case S_IFDIR : - err =vfs_mkdir (dirp, dchild, iap->ia_mode); + err =vfs_mkdir (dirp, dchild, iap->ia_mode,NULL );break ;case S_IFCHR :case S_IFBLK :case S_IFIFO :case S_IFSOCK : - err =vfs_mknod (dirp, dchild, iap->ia_mode, rdev); + err =vfs_mknod (dirp, dchild, iap->ia_mode, rdev,NULL );break ;default :printk ("nfsd: bad file type %o in nfsd_create\n" , type);
@@ -1397,11 +1397,13 @@ nfsd_symlink(struct svc_rqst *rqstp, strelse {strncpy (path_alloced, path, plen); path_alloced[plen] =0 ; - err =vfs_symlink (dentry->d_inode, dnew, path_alloced, mode); + err =vfs_symlink (dentry->d_inode, dnew, + path_alloced, mode,NULL );kfree (path_alloced); } }else - err =vfs_symlink (dentry->d_inode, dnew, path, mode); + err =vfs_symlink (dentry->d_inode, dnew, + path, mode,NULL );if (!err) {if (EX_ISSYNC (fhp->fh_export))
@@ -1459,7 +1461,7 @@ nfsd_link(struct svc_rqst *rqstp, struct dold = tfhp->fh_dentry; dest = dold->d_inode; - err =vfs_link (dold, dirp, dnew); + err =vfs_link (dold, dirp, dnew,NULL );if (!err) {if (EX_ISSYNC (ffhp->fh_export)) {nfsd_sync_dir (ddir);
@@ -1620,9 +1622,9 @@ nfsd_unlink(struct svc_rqst *rqstp, stru err = nfserr_perm; } else#endif - err =vfs_unlink (dirp, rdentry); + err =vfs_unlink (dirp, rdentry,NULL ); }else {/* It's RMDIR */ - err =vfs_rmdir (dirp, rdentry); + err =vfs_rmdir (dirp, rdentry,NULL ); }dput (rdentry);
fs/reiserfs/xattr.c +1 -1
@@ -834,7 +834,7 @@ reiserfs_delete_xattrs (struct inode *inif (dir->d_inode->i_nlink <=2 ) { root =get_xa_root (inode->i_sb);reiserfs_write_lock_xattrs (inode->i_sb); - err =vfs_rmdir (root->d_inode, dir); + err =vfs_rmdir (root->d_inode, dir,NULL );reiserfs_write_unlock_xattrs (inode->i_sb);dput (root); }else {
include/linux/fs.h +6 -6
@@ -835,12 +835,12 @@ static inline void unlock_super(struct s* VFS helper functions.. */ extern int vfs_create (struct inode *,struct dentry *,int ,struct nameidata *); -extern int vfs_mkdir (struct inode *,struct dentry *,int ); -extern int vfs_mknod (struct inode *,struct dentry *,int ,dev_t ); -extern int vfs_symlink (struct inode *,struct dentry *,const char *,int ); -extern int vfs_link (struct dentry *,struct inode *,struct dentry *); -extern int vfs_rmdir (struct inode *,struct dentry *); -extern int vfs_unlink (struct inode *,struct dentry *); +extern int vfs_mkdir (struct inode *,struct dentry *,int ,struct nameidata *); +extern int vfs_mknod (struct inode *,struct dentry *,int ,dev_t ,struct nameidata *); +extern int vfs_symlink (struct inode *,struct dentry *,const char *,int ,struct nameidata *); +extern int vfs_link (struct dentry *,struct inode *,struct dentry *,struct nameidata *); +extern int vfs_rmdir (struct inode *,struct dentry *,struct nameidata *); +extern int vfs_unlink (struct inode *,struct dentry *,struct nameidata *);extern int vfs_rename (struct inode *,struct dentry *,struct inode *,struct dentry *);/*
ipc/mqueue.c +1 -1
@@ -728,7 +728,7 @@ asmlinkage long sys_mq_unlink(const charif (inode)atomic_inc (&inode->i_count); - err =vfs_unlink (dentry->d_parent->d_inode, dentry); + err =vfs_unlink (dentry->d_parent->d_inode, dentry,NULL ); out_err:dput (dentry);
net/unix/af_unix.c +1 -1
@@ -794,7 +794,7 @@ static int unix_bind(struct socket *sock*/ mode =S_IFSOCK | (SOCK_INODE (sock)->i_mode & ~current->fs->umask); - err =vfs_mknod (nd.dentry->d_inode, dentry, mode,0 ); + err =vfs_mknod (nd.dentry->d_inode, dentry, mode,0 ,NULL );if (err) goto out_mknod_dput;up (&nd.dentry->d_inode->i_sem);