lkml.org 
[lkml]   [2010]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch] smack: opt_dentry is never null in in smack_d_instantiate()
    This patch removes some unneeded code for if opt_dentry is null because
    that can never happen.

    The function dereferences "opt_dentry" earlier when it checks
    "if (opt_dentry->d_parent == opt_dentry) {". That code was added in
    2008.

    This function called from security_d_instantiate(). I checked all the
    places which call security_d_instantiate() and dentry is always non-null.
    I also checked the selinux version of this hook and there is a comment
    which says that dentry should be non-null if called from
    d_instantiate().

    Signed-off-by: Dan Carpenter <error27@gmail.com>

    diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
    index 0f2fc48..07abc9c 100644
    --- a/security/smack/smack_lsm.c
    +++ b/security/smack/smack_lsm.c
    @@ -2191,7 +2191,7 @@ static void smack_ipc_getsecid(struct kern_ipc_perm *ipp, u32 *secid)

    /**
    * smack_d_instantiate - Make sure the blob is correct on an inode
    - * @opt_dentry: unused
    + * @opt_dentry: dentry where inode will be attached
    * @inode: the object
    *
    * Set the inode's security blob if it hasn't been done already.
    @@ -2310,20 +2310,10 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
    /*
    * Get the dentry for xattr.
    */
    - if (opt_dentry == NULL) {
    - dp = d_find_alias(inode);
    - if (dp == NULL)
    - break;
    - } else {
    - dp = dget(opt_dentry);
    - if (dp == NULL)
    - break;
    - }
    -
    + dp = dget(opt_dentry);
    fetched = smk_fetch(inode, dp);
    if (fetched != NULL)
    final = fetched;
    -
    dput(dp);
    break;
    }

    \
     
     \ /
      Last update: 2010-06-01 09:17    [W:0.021 / U:1.032 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site