From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753552AbdC2PZz (ORCPT ); Wed, 29 Mar 2017 11:25:55 -0400 Received: from mail-vk0-f68.google.com ([209.85.213.68]:35616 "EHLO mail-vk0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752473AbdC2PZw (ORCPT ); Wed, 29 Mar 2017 11:25:52 -0400 MIME-Version: 1.0 X-Originating-IP: [108.49.102.27] In-Reply-To: <6ceee0fa-a0ab-fe42-4213-f7985031ddfa@users.sourceforge.net> References: <6ceee0fa-a0ab-fe42-4213-f7985031ddfa@users.sourceforge.net> From: Paul Moore Date: Wed, 29 Mar 2017 11:25:50 -0400 Message-ID: Subject: Re: [PATCH 32/46] selinux: Return directly after a failed kzalloc() in class_read() To: SF Markus Elfring Cc: linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, Eric Paris , James Morris , "Serge E. Hallyn" , Stephen Smalley , William Roberts , LKML , kernel-janitors@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jan 15, 2017 at 10:32 AM, SF Markus Elfring wrote: > From: Markus Elfring > 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 > --- > 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 www.paul-moore.com