lkml.org 
[lkml]   [2007]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[AppArmor 21/44] Add a struct vfsmount parameter to vfs_setxattr()
    The vfsmount will be passed down to the LSM hook so that LSMs can compute
    pathnames.

    Signed-off-by: Tony Jones <tonyj@suse.de>
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: John Johansen <jjohansen@suse.de>

    ---
    fs/nfsd/vfs.c | 16 +++++++++++-----
    fs/xattr.c | 16 ++++++++--------
    include/linux/xattr.h | 3 ++-
    3 files changed, 21 insertions(+), 14 deletions(-)

    --- a/fs/nfsd/vfs.c
    +++ b/fs/nfsd/vfs.c
    @@ -396,7 +396,8 @@ static ssize_t nfsd_getxattr(struct dent

    #if defined(CONFIG_NFSD_V4)
    static int
    -set_nfsv4_acl_one(struct dentry *dentry, struct posix_acl *pacl, char *key)
    +set_nfsv4_acl_one(struct dentry *dentry, struct vfsmount *mnt,
    + struct posix_acl *pacl, char *key)
    {
    int len;
    size_t buflen;
    @@ -415,7 +416,7 @@ set_nfsv4_acl_one(struct dentry *dentry,
    goto out;
    }

    - error = vfs_setxattr(dentry, key, buf, len, 0);
    + error = vfs_setxattr(dentry, mnt, key, buf, len, 0);
    out:
    kfree(buf);
    return error;
    @@ -428,6 +429,7 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
    __be32 error;
    int host_error;
    struct dentry *dentry;
    + struct vfsmount *mnt;
    struct inode *inode;
    struct posix_acl *pacl = NULL, *dpacl = NULL;
    unsigned int flags = 0;
    @@ -438,6 +440,7 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
    goto out;

    dentry = fhp->fh_dentry;
    + mnt = fhp->fh_export->ex_mnt;
    inode = dentry->d_inode;
    if (S_ISDIR(inode->i_mode))
    flags = NFS4_ACL_DIR;
    @@ -449,12 +452,14 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqst
    } else if (host_error < 0)
    goto out_nfserr;

    - host_error = set_nfsv4_acl_one(dentry, pacl, POSIX_ACL_XATTR_ACCESS);
    + host_error = set_nfsv4_acl_one(dentry, mnt, pacl,
    + POSIX_ACL_XATTR_ACCESS);
    if (host_error < 0)
    goto out_nfserr;

    if (S_ISDIR(inode->i_mode)) {
    - host_error = set_nfsv4_acl_one(dentry, dpacl, POSIX_ACL_XATTR_DEFAULT);
    + host_error = set_nfsv4_acl_one(dentry, mnt, dpacl,
    + POSIX_ACL_XATTR_DEFAULT);
    if (host_error < 0)
    goto out_nfserr;
    }
    @@ -1982,7 +1987,8 @@ nfsd_set_posix_acl(struct svc_fh *fhp, i
    size = 0;

    if (size)
    - error = vfs_setxattr(fhp->fh_dentry, name, value, size, 0);
    + error = vfs_setxattr(fhp->fh_dentry, fhp->fh_export->ex_mnt,
    + name, value, size,0);
    else {
    if (!S_ISDIR(inode->i_mode) && type == ACL_TYPE_DEFAULT)
    error = 0;
    --- a/fs/xattr.c
    +++ b/fs/xattr.c
    @@ -69,8 +69,8 @@ xattr_permission(struct inode *inode, co
    }

    int
    -vfs_setxattr(struct dentry *dentry, char *name, void *value,
    - size_t size, int flags)
    +vfs_setxattr(struct dentry *dentry, struct vfsmount *mnt, char *name,
    + void *value, size_t size, int flags)
    {
    struct inode *inode = dentry->d_inode;
    int error;
    @@ -193,8 +193,8 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
    * Extended attribute SET operations
    */
    static long
    -setxattr(struct dentry *d, char __user *name, void __user *value,
    - size_t size, int flags)
    +setxattr(struct dentry *dentry, struct vfsmount *mnt, char __user *name,
    + void __user *value, size_t size, int flags)
    {
    int error;
    void *kvalue = NULL;
    @@ -221,7 +221,7 @@ setxattr(struct dentry *d, char __user *
    }
    }

    - error = vfs_setxattr(d, kname, kvalue, size, flags);
    + error = vfs_setxattr(dentry, mnt, kname, kvalue, size, flags);
    kfree(kvalue);
    return error;
    }
    @@ -236,7 +236,7 @@ sys_setxattr(char __user *path, char __u
    error = user_path_walk(path, &nd);
    if (error)
    return error;
    - error = setxattr(nd.dentry, name, value, size, flags);
    + error = setxattr(nd.dentry, nd.mnt, name, value, size, flags);
    path_release(&nd);
    return error;
    }
    @@ -251,7 +251,7 @@ sys_lsetxattr(char __user *path, char __
    error = user_path_walk_link(path, &nd);
    if (error)
    return error;
    - error = setxattr(nd.dentry, name, value, size, flags);
    + error = setxattr(nd.dentry, nd.mnt, name, value, size, flags);
    path_release(&nd);
    return error;
    }
    @@ -269,7 +269,7 @@ sys_fsetxattr(int fd, char __user *name,
    return error;
    dentry = f->f_path.dentry;
    audit_inode(NULL, dentry->d_inode);
    - error = setxattr(dentry, name, value, size, flags);
    + error = setxattr(dentry, f->f_vfsmnt, name, value, size, flags);
    fput(f);
    return error;
    }
    --- a/include/linux/xattr.h
    +++ b/include/linux/xattr.h
    @@ -48,7 +48,8 @@ struct xattr_handler {

    ssize_t vfs_getxattr(struct dentry *, char *, void *, size_t);
    ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
    -int vfs_setxattr(struct dentry *, char *, void *, size_t, int);
    +int vfs_setxattr(struct dentry *, struct vfsmount *, char *, void *, size_t,
    + int);
    int vfs_removexattr(struct dentry *, char *);

    ssize_t generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size);
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-06-27 01:23    [W:0.030 / U:0.056 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site