lkml.org 
[lkml]   [2007]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[AppArmor 22/41] Pass struct vfsmount to the inode_rename LSM hook
    This is needed for computing pathnames in the AppArmor LSM.

    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/namei.c | 6 ++++--
    include/linux/security.h | 18 +++++++++++++-----
    security/dummy.c | 4 +++-
    security/selinux/hooks.c | 8 ++++++--
    4 files changed, 26 insertions(+), 10 deletions(-)

    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2399,7 +2399,8 @@ static int vfs_rename_dir(struct inode *
    return error;
    }

    - error = security_inode_rename(old_dir, old_dentry, new_dir, new_dentry);
    + error = security_inode_rename(old_dir, old_dentry, old_mnt,
    + new_dir, new_dentry, new_mnt);
    if (error)
    return error;

    @@ -2433,7 +2434,8 @@ static int vfs_rename_other(struct inode
    struct inode *target;
    int error;

    - error = security_inode_rename(old_dir, old_dentry, new_dir, new_dentry);
    + error = security_inode_rename(old_dir, old_dentry, old_mnt,
    + new_dir, new_dentry, new_mnt);
    if (error)
    return error;

    --- a/include/linux/security.h
    +++ b/include/linux/security.h
    @@ -336,8 +336,10 @@ struct request_sock;
    * Check for permission to rename a file or directory.
    * @old_dir contains the inode structure for parent of the old link.
    * @old_dentry contains the dentry structure of the old link.
    + * @old_mnt is the vfsmount corresponding to @old_dentry (may be NULL).
    * @new_dir contains the inode structure for parent of the new link.
    * @new_dentry contains the dentry structure of the new link.
    + * @new_mnt is the vfsmount corresponding to @new_dentry (may be NULL).
    * Return 0 if permission is granted.
    * @inode_readlink:
    * Check the permission to read the symbolic link.
    @@ -1230,7 +1232,9 @@ struct security_operations {
    int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
    struct vfsmount *mnt, int mode, dev_t dev);
    int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
    - struct inode *new_dir, struct dentry *new_dentry);
    + struct vfsmount *old_mnt,
    + struct inode *new_dir, struct dentry *new_dentry,
    + struct vfsmount *new_mnt);
    int (*inode_readlink) (struct dentry *dentry, struct vfsmount *mnt);
    int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);
    int (*inode_permission) (struct inode *inode, int mask, struct nameidata *nd);
    @@ -1696,14 +1700,16 @@ static inline int security_inode_mknod (

    static inline int security_inode_rename (struct inode *old_dir,
    struct dentry *old_dentry,
    + struct vfsmount *old_mnt,
    struct inode *new_dir,
    - struct dentry *new_dentry)
    + struct dentry *new_dentry,
    + struct vfsmount *new_mnt)
    {
    if (unlikely (IS_PRIVATE (old_dentry->d_inode) ||
    (new_dentry->d_inode && IS_PRIVATE (new_dentry->d_inode))))
    return 0;
    - return security_ops->inode_rename (old_dir, old_dentry,
    - new_dir, new_dentry);
    + return security_ops->inode_rename (old_dir, old_dentry, old_mnt,
    + new_dir, new_dentry, new_mnt);
    }

    static inline int security_inode_readlink (struct dentry *dentry,
    @@ -2419,8 +2425,10 @@ static inline int security_inode_mknod (

    static inline int security_inode_rename (struct inode *old_dir,
    struct dentry *old_dentry,
    + struct vfsmount *old_mnt,
    struct inode *new_dir,
    - struct dentry *new_dentry)
    + struct dentry *new_dentry,
    + struct vfsmount *new_mnt)
    {
    return 0;
    }
    --- a/security/dummy.c
    +++ b/security/dummy.c
    @@ -310,8 +310,10 @@ static int dummy_inode_mknod (struct ino

    static int dummy_inode_rename (struct inode *old_inode,
    struct dentry *old_dentry,
    + struct vfsmount *old_mnt,
    struct inode *new_inode,
    - struct dentry *new_dentry)
    + struct dentry *new_dentry,
    + struct vfsmount *new_mnt)
    {
    return 0;
    }
    --- a/security/selinux/hooks.c
    +++ b/security/selinux/hooks.c
    @@ -2240,8 +2240,12 @@ static int selinux_inode_mknod(struct in
    return may_create(dir, dentry, inode_mode_to_security_class(mode));
    }

    -static int selinux_inode_rename(struct inode *old_inode, struct dentry *old_dentry,
    - struct inode *new_inode, struct dentry *new_dentry)
    +static int selinux_inode_rename(struct inode *old_inode,
    + struct dentry *old_dentry,
    + struct vfsmount *old_mnt,
    + struct inode *new_inode,
    + struct dentry *new_dentry,
    + struct vfsmount *new_mnt)
    {
    return may_rename(old_inode, old_dentry, new_inode, new_dentry);
    }
    --
    -
    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-04-12 11:57    [W:0.036 / U:151.176 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site