lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 086/261] selinux: fix error return code in policydb_read()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit 4c09f8b6913a779ca0c70ea8058bf21537eebb3b ]

    Fix to return negative error code -ENOMEM from the kvcalloc() error
    handling case instead of 0, as done elsewhere in this function.

    Fixes: acdf52d97f82 ("selinux: convert to kvmalloc")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Signed-off-by: Paul Moore <paul@paul-moore.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    security/selinux/ss/policydb.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
    index 1260f5fb766e..dd7aabd94a92 100644
    --- a/security/selinux/ss/policydb.c
    +++ b/security/selinux/ss/policydb.c
    @@ -2496,6 +2496,7 @@ int policydb_read(struct policydb *p, void *fp)
    if (rc)
    goto bad;

    + rc = -ENOMEM;
    p->type_attr_map_array = kvcalloc(p->p_types.nprim,
    sizeof(*p->type_attr_map_array),
    GFP_KERNEL);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 18:08    [W:4.333 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site