Re: [PATCH 29/46] selinux: Return directly after a failed kzalloc() in type_read()

From: Paul Moore
Date: Wed Mar 29 2017 - 11:21:20 EST


On Sun, Jan 15, 2017 at 10:29 AM, SF Markus Elfring
<elfring@xxxxxxxxxxxxxxxxxxxxx> wrote:
> From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> Date: Sat, 14 Jan 2017 22:15:54 +0100
>
> Return directly after a call of the function "kzalloc" failed
> at the beginning.
>
> Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
> ---
> security/selinux/ss/policydb.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

Merged, thanks.

> diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
> index 1c046d39e2a7..662139365449 100644
> --- a/security/selinux/ss/policydb.c
> +++ b/security/selinux/ss/policydb.c
> @@ -1467,10 +1467,9 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp)
> __le32 buf[4];
> u32 len;
>
> - rc = -ENOMEM;
> typdatum = kzalloc(sizeof(*typdatum), GFP_KERNEL);
> if (!typdatum)
> - goto bad;
> + return -ENOMEM;
>
> if (p->policyvers >= POLICYDB_VERSION_BOUNDARY)
> to_read = 4;
> --
> 2.11.0
>



--
paul moore
www.paul-moore.com