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 11/45] Pass struct vfsmount to the inode_readlink 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/stat.c | 2 +-
    include/linux/security.h | 8 +++++---
    security/dummy.c | 2 +-
    security/security.c | 4 ++--
    security/selinux/hooks.c | 2 +-
    5 files changed, 10 insertions(+), 8 deletions(-)

    --- a/fs/stat.c
    +++ b/fs/stat.c
    @@ -306,7 +306,7 @@ asmlinkage long sys_readlinkat(int dfd,

    error = -EINVAL;
    if (inode->i_op && inode->i_op->readlink) {
    - error = security_inode_readlink(nd.dentry);
    + error = security_inode_readlink(nd.dentry, nd.mnt);
    if (!error) {
    touch_atime(nd.mnt, nd.dentry);
    error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
    --- a/include/linux/security.h
    +++ b/include/linux/security.h
    @@ -352,6 +352,7 @@ struct request_sock;
    * @inode_readlink:
    * Check the permission to read the symbolic link.
    * @dentry contains the dentry structure for the file link.
    + * @mnt is the vfsmount corresponding to @dentry (may be NULL).
    * Return 0 if permission is granted.
    * @inode_follow_link:
    * Check permission to follow a symbolic link when looking up a pathname.
    @@ -1253,7 +1254,7 @@ struct security_operations {
    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);
    - int (*inode_readlink) (struct dentry *dentry);
    + 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);
    int (*inode_setattr) (struct dentry *dentry, struct vfsmount *mnt,
    @@ -1511,7 +1512,7 @@ int security_inode_mknod(struct inode *d
    struct vfsmount *mnt, int mode, dev_t dev);
    int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
    struct inode *new_dir, struct dentry *new_dentry);
    -int security_inode_readlink(struct dentry *dentry);
    +int security_inode_readlink(struct dentry *dentry, struct vfsmount *mnt);
    int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd);
    int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd);
    int security_inode_setattr(struct dentry *dentry, struct vfsmount *mnt,
    @@ -1868,7 +1869,8 @@ static inline int security_inode_rename
    return 0;
    }

    -static inline int security_inode_readlink (struct dentry *dentry)
    +static inline int security_inode_readlink (struct dentry *dentry,
    + struct vfsmount *mnt)
    {
    return 0;
    }
    --- a/security/dummy.c
    +++ b/security/dummy.c
    @@ -309,7 +309,7 @@ static int dummy_inode_rename (struct in
    return 0;
    }

    -static int dummy_inode_readlink (struct dentry *dentry)
    +static int dummy_inode_readlink (struct dentry *dentry, struct vfsmount *mnt)
    {
    return 0;
    }
    --- a/security/security.c
    +++ b/security/security.c
    @@ -392,11 +392,11 @@ int security_inode_rename(struct inode *
    new_dir, new_dentry);
    }

    -int security_inode_readlink(struct dentry *dentry)
    +int security_inode_readlink(struct dentry *dentry, struct vfsmount *mnt)
    {
    if (unlikely(IS_PRIVATE(dentry->d_inode)))
    return 0;
    - return security_ops->inode_readlink(dentry);
    + return security_ops->inode_readlink(dentry, mnt);
    }

    int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
    --- a/security/selinux/hooks.c
    +++ b/security/selinux/hooks.c
    @@ -2245,7 +2245,7 @@ static int selinux_inode_rename(struct i
    return may_rename(old_inode, old_dentry, new_inode, new_dentry);
    }

    -static int selinux_inode_readlink(struct dentry *dentry)
    +static int selinux_inode_readlink(struct dentry *dentry, struct vfsmount *mnt)
    {
    return dentry_has_perm(current, NULL, dentry, FILE__READ);
    }
    --

    -
    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.053 / U:120.864 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site