[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <1267026090.2618.4.camel@localhost.localdomain>
Date: Wed, 24 Feb 2010 10:41:30 -0500
From: Mimi Zohar <zohar@...ux.vnet.ibm.com>
To: Xiaotian Feng <dfeng@...hat.com>
Cc: linux-security-module@...r.kernel.org,
linux-kernel@...r.kernel.org, Mimi Zohar <zohar@...ibm.com>,
James Morris <jmorris@...ei.org>,
Eric Paris <eparis@...hat.com>,
Al Viro <viro@...iv.linux.org.uk>,
"Amit K. Arora" <amitarora@...ibm.com>
Subject: Re: [PATCH] security: fix error return path in ima_inode_alloc
On Wed, 2010-02-24 at 18:39 +0800, Xiaotian Feng wrote:
> If radix_tree_preload is failed in ima_inode_alloc, we don't need
> radix_tree_preload_end because kernel is alread preempt enabled
>
> Signed-off-by: Xiaotian Feng <dfeng@...hat.com>
Signed-off-by: Mimi Zohar <zohar@...ibm.com>
thanks,
Mimi
> Cc: Mimi Zohar <zohar@...ibm.com>
> Cc: James Morris <jmorris@...ei.org>
> Cc: Eric Paris <eparis@...hat.com>
> Cc: Al Viro <viro@...iv.linux.org.uk>
> Cc: Amit K. Arora <amitarora@...ibm.com>
> ---
> security/integrity/ima/ima_iint.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c
> index 0d83edc..2d4d05d 100644
> --- a/security/integrity/ima/ima_iint.c
> +++ b/security/integrity/ima/ima_iint.c
> @@ -63,12 +63,11 @@ int ima_inode_alloc(struct inode *inode)
> spin_lock(&ima_iint_lock);
> rc = radix_tree_insert(&ima_iint_store, (unsigned long)inode, iint);
> spin_unlock(&ima_iint_lock);
> + radix_tree_preload_end();
> out:
> if (rc < 0)
> kmem_cache_free(iint_cache, iint);
>
> - radix_tree_preload_end();
> -
> return rc;
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists