Prev: inconsistent lock state (2.6.34, XFS inode shrinker)
Next: [PATCH] memcg remove experimental from swap account config
From: Casey Schaufler on 1 Jun 2010 20:40
Dan Carpenter wrote:
> 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(a)gmail.com>
>

Acked-by: Casey Schaufler <casey(a)schaufler-ca.com>

I have tested the change and not had any issues. I recall struggling
with this particular bit of code, but that was long enough ago that
the circumstances evade my memory. Thank you.

> 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;
> }
>
>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: inconsistent lock state (2.6.34, XFS inode shrinker)
Next: [PATCH] memcg remove experimental from swap account config