lkml.org 
[lkml]   [2017]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 30/46] selinux: Return directly after a failed kzalloc() in role_read()
On Sun, Jan 15, 2017 at 10:30 AM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 14 Jan 2017 22:20:25 +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 662139365449..34b670227c4d 100644
> --- a/security/selinux/ss/policydb.c
> +++ b/security/selinux/ss/policydb.c
> @@ -1410,10 +1410,9 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp)
> __le32 buf[3];
> u32 len;
>
> - rc = -ENOMEM;
> role = kzalloc(sizeof(*role), GFP_KERNEL);
> if (!role)
> - goto bad;
> + return -ENOMEM;
>
> if (p->policyvers >= POLICYDB_VERSION_BOUNDARY)
> to_read = 3;
> --
> 2.11.0
>



--
paul moore
www.paul-moore.com

\
 
 \ /
  Last update: 2017-03-29 17:24    [W:0.682 / U:0.160 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site