mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-05 16:55:32 +00:00
88 lines
3.4 KiB
Diff
88 lines
3.4 KiB
Diff
|
Add struct vfsmount parameter to vfs_mkdir
|
||
|
|
|
||
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
||
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
||
|
|
|
||
|
|
Index: linux-2.6.19/fs/ecryptfs/inode.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/fs/ecryptfs/inode.c
|
||
|
|
+++ linux-2.6.19/fs/ecryptfs/inode.c
|
||
|
|
@@ -540,11 +540,14 @@ static int ecryptfs_mkdir(struct inode *
|
||
|
|
{
|
||
|
|
int rc;
|
||
|
|
struct dentry *lower_dentry;
|
||
|
|
+ struct vfsmount *lower_mnt;
|
||
|
|
struct dentry *lower_dir_dentry;
|
||
|
|
|
||
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
||
|
|
+ lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
|
||
|
|
lower_dir_dentry = lock_parent(lower_dentry);
|
||
|
|
- rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, mode);
|
||
|
|
+ rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_mnt, lower_dentry,
|
||
|
|
+ mode);
|
||
|
|
if (rc || !lower_dentry->d_inode)
|
||
|
|
goto out;
|
||
|
|
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
|
||
|
|
Index: linux-2.6.19/fs/namei.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/fs/namei.c
|
||
|
|
+++ linux-2.6.19/fs/namei.c
|
||
|
|
@@ -1919,7 +1919,8 @@ asmlinkage long sys_mknod(const char __u
|
||
|
|
return sys_mknodat(AT_FDCWD, filename, mode, dev);
|
||
|
|
}
|
||
|
|
|
||
|
|
-int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
|
||
|
|
+int vfs_mkdir(struct inode *dir, struct vfsmount *mnt, struct dentry *dentry,
|
||
|
|
+ int mode)
|
||
|
|
{
|
||
|
|
int error = may_create(dir, dentry, NULL);
|
||
|
|
|
||
|
|
@@ -1963,7 +1964,7 @@ asmlinkage long sys_mkdirat(int dfd, con
|
||
|
|
|
||
|
|
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, nd.mnt, dentry, mode);
|
||
|
|
dput(dentry);
|
||
|
|
out_unlock:
|
||
|
|
mutex_unlock(&nd.dentry->d_inode->i_mutex);
|
||
|
|
Index: linux-2.6.19/fs/nfsd/nfs4recover.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/fs/nfsd/nfs4recover.c
|
||
|
|
+++ linux-2.6.19/fs/nfsd/nfs4recover.c
|
||
|
|
@@ -156,7 +156,7 @@ nfsd4_create_clid_dir(struct nfs4_client
|
||
|
|
dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
|
||
|
|
goto out_put;
|
||
|
|
}
|
||
|
|
- status = vfs_mkdir(rec_dir.dentry->d_inode, dentry, S_IRWXU);
|
||
|
|
+ status = vfs_mkdir(rec_dir.dentry->d_inode, NULL, dentry, S_IRWXU);
|
||
|
|
out_put:
|
||
|
|
dput(dentry);
|
||
|
|
out_unlock:
|
||
|
|
Index: linux-2.6.19/fs/nfsd/vfs.c
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/fs/nfsd/vfs.c
|
||
|
|
+++ linux-2.6.19/fs/nfsd/vfs.c
|
||
|
|
@@ -1183,7 +1183,7 @@ nfsd_create(struct svc_rqst *rqstp, stru
|
||
|
|
host_err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
|
||
|
|
break;
|
||
|
|
case S_IFDIR:
|
||
|
|
- host_err = vfs_mkdir(dirp, dchild, iap->ia_mode);
|
||
|
|
+ host_err = vfs_mkdir(dirp, NULL, dchild, iap->ia_mode);
|
||
|
|
break;
|
||
|
|
case S_IFCHR:
|
||
|
|
case S_IFBLK:
|
||
|
|
Index: linux-2.6.19/include/linux/fs.h
|
||
|
|
===================================================================
|
||
|
|
--- linux-2.6.19.orig/include/linux/fs.h
|
||
|
|
+++ linux-2.6.19/include/linux/fs.h
|
||
|
|
@@ -1013,7 +1013,7 @@ static inline void unlock_super(struct s
|
||
|
|
*/
|
||
|
|
extern int vfs_permission(struct nameidata *, int);
|
||
|
|
extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
|
||
|
|
-extern int vfs_mkdir(struct inode *, struct dentry *, int);
|
||
|
|
+extern int vfs_mkdir(struct inode *, struct vfsmount *, 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 *);
|