lkml.org 
[lkml]   [2010]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] security: fix error return path in ima_inode_alloc
    Date
    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@redhat.com>
    Cc: Mimi Zohar <zohar@us.ibm.com>
    Cc: James Morris <jmorris@namei.org>
    Cc: Eric Paris <eparis@redhat.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Amit K. Arora <amitarora@in.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;
    }

    --
    1.6.6


    \
     
     \ /
      Last update: 2010-02-24 11:41    [W:0.018 / U:32.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site