lkml.org 
[lkml]   [2010]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] security/integrity/ima/ima_iint.c: Remove goto out int ima_inode_alloc()
From
On Mon, Feb 8, 2010 at 2:57 PM, wzt wzt <wzt.wzt@gmail.com> wrote:
> Signed-off-by: wzt <zhitong.wangzt@alibaba-inc.com>
>
> diff --git a/security/integrity/ima/ima_iint.c
> b/security/integrity/ima/ima_iint.c
> index 0d83edc..4e2df22 100644
> --- a/security/integrity/ima/ima_iint.c
> +++ b/security/integrity/ima/ima_iint.c
> @@ -57,18 +57,17 @@ int ima_inode_alloc(struct inode *inode)
>                return -ENOMEM;
>
>        rc = radix_tree_preload(GFP_NOFS);
> -       if (rc < 0)
> -               goto out;
> +       if (rc < 0) {
> +               kmem_cache_free(iint_cache, iint);
> +               radix_tree_preload_end();
> +               return rc;
> +       }
>
>        spin_lock(&ima_iint_lock);
>        rc = radix_tree_insert(&ima_iint_store, (unsigned long)inode, iint);
>        spin_unlock(&ima_iint_lock);
> -out:
> -       if (rc < 0)
> -               kmem_cache_free(iint_cache, iint);

So if radix_tree_insert failed, the memory will be leaked.
This patch doesn't fix anything but introduces new bug....

>
>        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@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
--
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: 2010-02-08 08:11    [W:0.035 / U:0.268 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site