lkml.org 
[lkml]   [2007]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 09/12] selinux: explicitly number all selinuxfs inodes
    From: James Carter <jwcart2@tycho.nsa.gov>

    Explicitly number all selinuxfs inodes to prevent a conflict between
    inodes numbered using last_ino when created with new_inode() and those
    labeled explicitly.

    Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
    Acked-by: Eric Paris <eparis@parisplace.org>
    Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
    Signed-off-by: James Morris <jmorris@namei.org>
    ---
    security/selinux/selinuxfs.c | 6 ++++++
    1 files changed, 6 insertions(+), 0 deletions(-)

    diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
    index e24235c..1a786db 100644
    --- a/security/selinux/selinuxfs.c
    +++ b/security/selinux/selinuxfs.c
    @@ -100,8 +100,11 @@ enum sel_inos {
    SEL_MEMBER, /* compute polyinstantiation membership decision */
    SEL_CHECKREQPROT, /* check requested protection, not kernel-applied one */
    SEL_COMPAT_NET, /* whether to use old compat network packet controls */
    + SEL_INO_NEXT, /* The next inode number to use */
    };

    +static unsigned long sel_last_ino = SEL_INO_NEXT - 1;
    +
    #define SEL_INITCON_INO_OFFSET 0x01000000
    #define SEL_INO_MASK 0x00ffffff

    @@ -1237,6 +1240,7 @@ static int sel_make_avc_files(struct dentry *dir)
    goto out;
    }
    inode->i_fop = files[i].ops;
    + inode->i_ino = ++sel_last_ino;
    d_add(dentry, inode);
    }
    out:
    @@ -1304,6 +1308,7 @@ static int sel_make_dir(struct inode *dir, struct dentry *dentry)
    }
    inode->i_op = &simple_dir_inode_operations;
    inode->i_fop = &simple_dir_operations;
    + inode->i_ino = ++sel_last_ino;
    /* directory inodes start off with i_nlink == 2 (for "." entry) */
    inc_nlink(inode);
    d_add(dentry, inode);
    @@ -1366,6 +1371,7 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
    ret = -ENOMEM;
    goto err;
    }
    + inode->i_ino = ++sel_last_ino;
    isec = (struct inode_security_struct*)inode->i_security;
    isec->sid = SECINITSID_DEVNULL;
    isec->sclass = SECCLASS_CHR_FILE;
    --
    1.5.0.6
    -
    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-04-26 08:13    [W:0.022 / U:30.748 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site