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 04/45] Pass struct vfsmount to the inode_setattr 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/attr.c | 4 ++--
    include/linux/security.h | 8 ++++++--
    security/dummy.c | 3 ++-
    security/selinux/hooks.c | 5 +++--
    4 files changed, 13 insertions(+), 7 deletions(-)

    --- a/fs/attr.c
    +++ b/fs/attr.c
    @@ -144,13 +144,13 @@ int notify_change(struct dentry *dentry,
    down_write(&dentry->d_inode->i_alloc_sem);

    if (inode->i_op && inode->i_op->setattr) {
    - error = security_inode_setattr(dentry, attr);
    + error = security_inode_setattr(dentry, mnt, attr);
    if (!error)
    error = inode->i_op->setattr(dentry, attr);
    } else {
    error = inode_change_ok(inode, attr);
    if (!error)
    - error = security_inode_setattr(dentry, attr);
    + error = security_inode_setattr(dentry, mnt, attr);
    if (!error) {
    if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
    (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
    --- a/include/linux/security.h
    +++ b/include/linux/security.h
    @@ -358,6 +358,7 @@ struct request_sock;
    * file attributes change (such as when a file is truncated, chown/chmod
    * operations, transferring disk quotas, etc).
    * @dentry contains the dentry structure for the file.
    + * @mnt is the vfsmount corresponding to @dentry (may be NULL).
    * @attr is the iattr structure containing the new file attributes.
    * Return 0 if permission is granted.
    * @inode_getattr:
    @@ -1221,7 +1222,8 @@ struct security_operations {
    int (*inode_readlink) (struct dentry *dentry);
    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 iattr *attr);
    + int (*inode_setattr) (struct dentry *dentry, struct vfsmount *mnt,
    + struct iattr *attr);
    int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);
    void (*inode_delete) (struct inode *inode);
    int (*inode_setxattr) (struct dentry *dentry, char *name, void *value,
    @@ -1708,11 +1710,12 @@ static inline int security_inode_permiss
    }

    static inline int security_inode_setattr (struct dentry *dentry,
    + struct vfsmount *mnt,
    struct iattr *attr)
    {
    if (unlikely (IS_PRIVATE (dentry->d_inode)))
    return 0;
    - return security_ops->inode_setattr (dentry, attr);
    + return security_ops->inode_setattr (dentry, mnt, attr);
    }

    static inline int security_inode_getattr (struct vfsmount *mnt,
    @@ -2412,6 +2415,7 @@ static inline int security_inode_permiss
    }

    static inline int security_inode_setattr (struct dentry *dentry,
    + struct vfsmount *mnt,
    struct iattr *attr)
    {
    return 0;
    --- a/security/dummy.c
    +++ b/security/dummy.c
    @@ -328,7 +328,8 @@ static int dummy_inode_permission (struc
    return 0;
    }

    -static int dummy_inode_setattr (struct dentry *dentry, struct iattr *iattr)
    +static int dummy_inode_setattr (struct dentry *dentry, struct vfsmount *mnt,
    + struct iattr *iattr)
    {
    return 0;
    }
    --- a/security/selinux/hooks.c
    +++ b/security/selinux/hooks.c
    @@ -2267,11 +2267,12 @@ static int selinux_inode_permission(stru
    file_mask_to_av(inode->i_mode, mask), NULL);
    }

    -static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
    +static int selinux_inode_setattr(struct dentry *dentry, struct vfsmount *mnt,
    + struct iattr *iattr)
    {
    int rc;

    - rc = secondary_ops->inode_setattr(dentry, iattr);
    + rc = secondary_ops->inode_setattr(dentry, mnt, iattr);
    if (rc)
    return rc;

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