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 10/44] Pass struct vfsmount to the inode_symlink 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 | 2 +-
    include/linux/security.h | 9 ++++++---
    security/dummy.c | 2 +-
    security/selinux/hooks.c | 3 ++-
    4 files changed, 10 insertions(+), 6 deletions(-)

    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2214,7 +2214,7 @@ int vfs_symlink(struct inode *dir, struc
    if (!dir->i_op || !dir->i_op->symlink)
    return -EPERM;

    - error = security_inode_symlink(dir, dentry, oldname);
    + error = security_inode_symlink(dir, dentry, mnt, oldname);
    if (error)
    return error;

    --- a/include/linux/security.h
    +++ b/include/linux/security.h
    @@ -301,6 +301,7 @@ struct request_sock;
    * Check the permission to create a symbolic link to a file.
    * @dir contains the inode structure of parent directory of the symbolic link.
    * @dentry contains the dentry structure of the symbolic link.
    + * @mnt is the vfsmount corresponding to @dentry (may be NULL).
    * @old_name contains the pathname of file.
    * Return 0 if permission is granted.
    * @inode_mkdir:
    @@ -1213,8 +1214,8 @@ struct security_operations {
    int (*inode_link) (struct dentry *old_dentry,
    struct inode *dir, struct dentry *new_dentry);
    int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
    - int (*inode_symlink) (struct inode *dir,
    - struct dentry *dentry, const char *old_name);
    + int (*inode_symlink) (struct inode *dir, struct dentry *dentry,
    + struct vfsmount *mnt, const char *old_name);
    int (*inode_mkdir) (struct inode *dir, struct dentry *dentry,
    struct vfsmount *mnt, int mode);
    int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
    @@ -1644,11 +1645,12 @@ static inline int security_inode_unlink

    static inline int security_inode_symlink (struct inode *dir,
    struct dentry *dentry,
    + struct vfsmount *mnt,
    const char *old_name)
    {
    if (unlikely (IS_PRIVATE (dir)))
    return 0;
    - return security_ops->inode_symlink (dir, dentry, old_name);
    + return security_ops->inode_symlink (dir, dentry, mnt, old_name);
    }

    static inline int security_inode_mkdir (struct inode *dir,
    @@ -2369,6 +2371,7 @@ static inline int security_inode_unlink

    static inline int security_inode_symlink (struct inode *dir,
    struct dentry *dentry,
    + struct vfsmount *mnt,
    const char *old_name)
    {
    return 0;
    --- a/security/dummy.c
    +++ b/security/dummy.c
    @@ -282,7 +282,7 @@ static int dummy_inode_unlink (struct in
    }

    static int dummy_inode_symlink (struct inode *inode, struct dentry *dentry,
    - const char *name)
    + struct vfsmount *mnt, const char *name)
    {
    return 0;
    }
    --- a/security/selinux/hooks.c
    +++ b/security/selinux/hooks.c
    @@ -2202,7 +2202,8 @@ static int selinux_inode_unlink(struct i
    return may_link(dir, dentry, MAY_UNLINK);
    }

    -static int selinux_inode_symlink(struct inode *dir, struct dentry *dentry, const char *name)
    +static int selinux_inode_symlink(struct inode *dir, struct dentry *dentry,
    + struct vfsmount *mnt, const char *name)
    {
    return may_create(dir, dentry, SECCLASS_LNK_FILE);
    }
    --
    -
    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:17    [W:0.029 / U:1.620 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site