lkml.org 
[lkml]   [2007]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[AppArmor 06/45] Pass struct vfsmount to the inode_mkdir 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 | 8 ++++++--
    security/dummy.c | 2 +-
    security/selinux/hooks.c | 3 ++-
    4 files changed, 10 insertions(+), 5 deletions(-)

    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -1946,7 +1946,7 @@ int vfs_mkdir(struct inode *dir, struct
    return -EPERM;

    mode &= (S_IRWXUGO|S_ISVTX);
    - error = security_inode_mkdir(dir, dentry, mode);
    + error = security_inode_mkdir(dir, dentry, mnt, mode);
    if (error)
    return error;

    --- a/include/linux/security.h
    +++ b/include/linux/security.h
    @@ -308,6 +308,7 @@ struct request_sock;
    * associated with inode strcture @dir.
    * @dir containst the inode structure of parent of the directory to be created.
    * @dentry contains the dentry structure of new directory.
    + * @mnt is the vfsmount corresponding to @dentry (may be NULL).
    * @mode contains the mode of new directory.
    * Return 0 if permission is granted.
    * @inode_rmdir:
    @@ -1213,7 +1214,8 @@ struct security_operations {
    int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
    int (*inode_symlink) (struct inode *dir,
    struct dentry *dentry, const char *old_name);
    - int (*inode_mkdir) (struct inode *dir, struct dentry *dentry, int mode);
    + int (*inode_mkdir) (struct inode *dir, struct dentry *dentry,
    + struct vfsmount *mnt, int mode);
    int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
    int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
    int mode, dev_t dev);
    @@ -1650,11 +1652,12 @@ static inline int security_inode_symlink

    static inline int security_inode_mkdir (struct inode *dir,
    struct dentry *dentry,
    + struct vfsmount *mnt,
    int mode)
    {
    if (unlikely (IS_PRIVATE (dir)))
    return 0;
    - return security_ops->inode_mkdir (dir, dentry, mode);
    + return security_ops->inode_mkdir (dir, dentry, mnt, mode);
    }

    static inline int security_inode_rmdir (struct inode *dir,
    @@ -2371,6 +2374,7 @@ static inline int security_inode_symlink

    static inline int security_inode_mkdir (struct inode *dir,
    struct dentry *dentry,
    + struct vfsmount *mnt,
    int mode)
    {
    return 0;
    --- a/security/dummy.c
    +++ b/security/dummy.c
    @@ -288,7 +288,7 @@ static int dummy_inode_symlink (struct i
    }

    static int dummy_inode_mkdir (struct inode *inode, struct dentry *dentry,
    - int mask)
    + struct vfsmount *mnt, int mask)
    {
    return 0;
    }
    --- a/security/selinux/hooks.c
    +++ b/security/selinux/hooks.c
    @@ -2207,7 +2207,8 @@ static int selinux_inode_symlink(struct
    return may_create(dir, dentry, SECCLASS_LNK_FILE);
    }

    -static int selinux_inode_mkdir(struct inode *dir, struct dentry *dentry, int mask)
    +static int selinux_inode_mkdir(struct inode *dir, struct dentry *dentry,
    + struct vfsmount *mnt, int mask)
    {
    return may_create(dir, dentry, SECCLASS_DIR);
    }
    --
    -
    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-05-14 13:39    [W:0.022 / U:30.520 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site