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

Paul Moore
2017-03-29T15:25:55Z

On Sun, Jan 15, 2017 at 10:32 AM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 14 Jan 2017 22:30:51 +0100
>
> Return directly after a call of the function "kzalloc" failed
> at the beginning.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> 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 49fc5d8990e9..3af2b0849495 100644
> --- a/security/selinux/ss/policydb.c
> +++ b/security/selinux/ss/policydb.c
> @@ -1316,10 +1316,9 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp)
> u32 len, len2, ncons, nel;
> int i, rc;
>
> - rc = -ENOMEM;
> cladatum = kzalloc(sizeof(*cladatum), GFP_KERNEL);
> if (!cladatum)
> - goto bad;
> + return -ENOMEM;
>
> rc = next_entry(buf, fp, sizeof(u32)*6);
> if (rc)
> --
> 2.11.0
>

--
paul moore