mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-05 17:01:00 +01:00
106 lines
3.8 KiB
Diff
106 lines
3.8 KiB
Diff
Add a struct vfsmount parameter to vfs_symlink()
|
|
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
|
|
|
Index: b/fs/ecryptfs/inode.c
|
|
===================================================================
|
|
--- a/fs/ecryptfs/inode.c
|
|
+++ b/fs/ecryptfs/inode.c
|
|
@@ -473,6 +473,7 @@ static int ecryptfs_symlink(struct inode
|
|
{
|
|
int rc;
|
|
struct dentry *lower_dentry;
|
|
+ struct vfsmount *lower_mnt;
|
|
struct dentry *lower_dir_dentry;
|
|
umode_t mode;
|
|
char *encoded_symname;
|
|
@@ -481,6 +482,7 @@ static int ecryptfs_symlink(struct inode
|
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
dget(lower_dentry);
|
|
+ lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
|
|
lower_dir_dentry = lock_parent(lower_dentry);
|
|
mode = S_IALLUGO;
|
|
encoded_symlen = ecryptfs_encode_filename(crypt_stat, symname,
|
|
@@ -490,7 +492,7 @@ static int ecryptfs_symlink(struct inode
|
|
rc = encoded_symlen;
|
|
goto out_lock;
|
|
}
|
|
- rc = vfs_symlink(lower_dir_dentry->d_inode, lower_dentry,
|
|
+ rc = vfs_symlink(lower_dir_dentry->d_inode, lower_dentry, lower_mnt,
|
|
encoded_symname, mode);
|
|
kfree(encoded_symname);
|
|
if (rc || !lower_dentry->d_inode)
|
|
Index: b/fs/namei.c
|
|
===================================================================
|
|
--- a/fs/namei.c
|
|
+++ b/fs/namei.c
|
|
@@ -2185,7 +2185,8 @@ asmlinkage long sys_unlink(const char __
|
|
return do_unlinkat(AT_FDCWD, pathname);
|
|
}
|
|
|
|
-int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, int mode)
|
|
+int vfs_symlink(struct inode *dir, struct dentry *dentry, struct vfsmount *mnt,
|
|
+ const char *oldname, int mode)
|
|
{
|
|
int error = may_create(dir, dentry, NULL);
|
|
|
|
@@ -2231,7 +2232,8 @@ asmlinkage long sys_symlinkat(const char
|
|
if (IS_ERR(dentry))
|
|
goto out_unlock;
|
|
|
|
- error = vfs_symlink(nd.dentry->d_inode, dentry, from, S_IALLUGO);
|
|
+ error = vfs_symlink(nd.dentry->d_inode, dentry, nd.mnt, from,
|
|
+ S_IALLUGO);
|
|
dput(dentry);
|
|
out_unlock:
|
|
mutex_unlock(&nd.dentry->d_inode->i_mutex);
|
|
Index: b/fs/nfsd/vfs.c
|
|
===================================================================
|
|
--- a/fs/nfsd/vfs.c
|
|
+++ b/fs/nfsd/vfs.c
|
|
@@ -1432,6 +1432,7 @@ nfsd_symlink(struct svc_rqst *rqstp, str
|
|
struct iattr *iap)
|
|
{
|
|
struct dentry *dentry, *dnew;
|
|
+ struct vfsmount *mnt;
|
|
__be32 err, cerr;
|
|
int host_err;
|
|
umode_t mode;
|
|
@@ -1458,6 +1459,7 @@ nfsd_symlink(struct svc_rqst *rqstp, str
|
|
if (iap && (iap->ia_valid & ATTR_MODE))
|
|
mode = iap->ia_mode & S_IALLUGO;
|
|
|
|
+ mnt = fhp->fh_export->ex_mnt;
|
|
if (unlikely(path[plen] != 0)) {
|
|
char *path_alloced = kmalloc(plen+1, GFP_KERNEL);
|
|
if (path_alloced == NULL)
|
|
@@ -1465,11 +1467,12 @@ nfsd_symlink(struct svc_rqst *rqstp, str
|
|
else {
|
|
strncpy(path_alloced, path, plen);
|
|
path_alloced[plen] = 0;
|
|
- host_err = vfs_symlink(dentry->d_inode, dnew, path_alloced, mode);
|
|
+ host_err = vfs_symlink(dentry->d_inode, dnew, mnt,
|
|
+ path_alloced, mode);
|
|
kfree(path_alloced);
|
|
}
|
|
} else
|
|
- host_err = vfs_symlink(dentry->d_inode, dnew, path, mode);
|
|
+ host_err = vfs_symlink(dentry->d_inode, dnew, mnt, path, mode);
|
|
|
|
if (!host_err) {
|
|
if (EX_ISSYNC(fhp->fh_export))
|
|
Index: b/include/linux/fs.h
|
|
===================================================================
|
|
--- a/include/linux/fs.h
|
|
+++ b/include/linux/fs.h
|
|
@@ -982,7 +982,7 @@ extern int vfs_permission(struct nameida
|
|
extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
|
|
extern int vfs_mkdir(struct inode *, struct dentry *, struct vfsmount *, int);
|
|
extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t);
|
|
-extern int vfs_symlink(struct inode *, struct dentry *, const char *, int);
|
|
+extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, 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 *);
|