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

    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2132,7 +2132,7 @@ int vfs_rmdir(struct inode *dir, struct
    if (d_mountpoint(dentry))
    error = -EBUSY;
    else {
    - error = security_inode_rmdir(dir, dentry);
    + error = security_inode_rmdir(dir, dentry, mnt);
    if (!error) {
    error = dir->i_op->rmdir(dir, dentry);
    if (!error)
    --- a/include/linux/security.h
    +++ b/include/linux/security.h
    @@ -332,6 +332,7 @@ struct request_sock;
    * Check the permission to remove a directory.
    * @dir contains the inode structure of parent of the directory to be removed.
    * @dentry contains the dentry structure of directory to be removed.
    + * @mnt is the vfsmount corresponding to @dentry (may be NULL).
    * Return 0 if permission is granted.
    * @inode_mknod:
    * Check permissions when creating a special file (or a socket or a fifo
    @@ -1252,7 +1253,8 @@ struct security_operations {
    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);
    + int (*inode_rmdir) (struct inode *dir, struct dentry *dentry,
    + struct vfsmount *mnt);
    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,
    @@ -1511,7 +1513,8 @@ int security_inode_symlink(struct inode
    struct vfsmount *mnt, const char *old_name);
    int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
    struct vfsmount *mnt, int mode);
    -int security_inode_rmdir(struct inode *dir, struct dentry *dentry);
    +int security_inode_rmdir(struct inode *dir, struct dentry *dentry,
    + struct vfsmount *mnt);
    int security_inode_mknod(struct inode *dir, struct dentry *dentry,
    struct vfsmount *mnt, int mode, dev_t dev);
    int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
    @@ -1854,7 +1857,8 @@ static inline int security_inode_mkdir (
    }

    static inline int security_inode_rmdir (struct inode *dir,
    - struct dentry *dentry)
    + struct dentry *dentry,
    + struct vfsmount *mnt)
    {
    return 0;
    }
    --- a/security/dummy.c
    +++ b/security/dummy.c
    @@ -292,7 +292,8 @@ static int dummy_inode_mkdir (struct ino
    return 0;
    }

    -static int dummy_inode_rmdir (struct inode *inode, struct dentry *dentry)
    +static int dummy_inode_rmdir (struct inode *inode, struct dentry *dentry,
    + struct vfsmount *mnt)
    {
    return 0;
    }
    --- a/security/security.c
    +++ b/security/security.c
    @@ -369,11 +369,12 @@ int security_inode_mkdir(struct inode *d
    return security_ops->inode_mkdir(dir, dentry, mnt, mode);
    }

    -int security_inode_rmdir(struct inode *dir, struct dentry *dentry)
    +int security_inode_rmdir(struct inode *dir, struct dentry *dentry,
    + struct vfsmount *mnt)
    {
    if (unlikely(IS_PRIVATE(dentry->d_inode)))
    return 0;
    - return security_ops->inode_rmdir(dir, dentry);
    + return security_ops->inode_rmdir(dir, dentry, mnt);
    }

    int security_inode_mknod(struct inode *dir, struct dentry *dentry,
    --- a/security/selinux/hooks.c
    +++ b/security/selinux/hooks.c
    @@ -2227,7 +2227,8 @@ static int selinux_inode_mkdir(struct in
    return may_create(dir, dentry, SECCLASS_DIR);
    }

    -static int selinux_inode_rmdir(struct inode *dir, struct dentry *dentry)
    +static int selinux_inode_rmdir(struct inode *dir, struct dentry *dentry,
    + struct vfsmount *mnt)
    {
    return may_link(dir, dentry, MAY_RMDIR);
    }
    --

    -
    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-10-26 09:05    [W:0.030 / U:0.188 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site