From patchwork Tue Apr 4 11:12:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9661403 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2ABB6602B9 for ; Tue, 4 Apr 2017 11:17:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CF862768C for ; Tue, 4 Apr 2017 11:17:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 11D9627A98; Tue, 4 Apr 2017 11:17:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6A512768C for ; Tue, 4 Apr 2017 11:17:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753484AbdDDLOk (ORCPT ); Tue, 4 Apr 2017 07:14:40 -0400 Received: from mout.web.de ([217.72.192.78]:65338 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753783AbdDDLNI (ORCPT ); Tue, 4 Apr 2017 07:13:08 -0400 Received: from [192.168.1.2] ([77.181.94.222]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0M1o3y-1c6GsN3UtO-00tm4M; Tue, 04 Apr 2017 13:12:50 +0200 Subject: [PATCH 1/3] selinux: Return directly after a failed memory allocation in policydb_index() From: SF Markus Elfring To: Casey Schaufler , Eric Paris , James Morris , Paul Moore , "Serge E. Hallyn" , Stephen Smalley , William Roberts , linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov Cc: LKML , kernel-janitors@vger.kernel.org References: <5704e656-708a-b611-5611-70fc65dc67e8@users.sourceforge.net> Message-ID: <8a517289-e5a7-8dde-0f5f-9e57f3e270c7@users.sourceforge.net> Date: Tue, 4 Apr 2017 13:12:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0 MIME-Version: 1.0 In-Reply-To: <5704e656-708a-b611-5611-70fc65dc67e8@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:EUBdAkBQ0rD4DlCXaT4nO1/mwUOMz6EJ/HJeggqM3NDSAL8kq5n e6z4oRYlIUzFyIkWISdcRBvgn6sDMVXziGoiXI0bdYXhaC0QVtdVuGvmcXtRIHaR/rpca2d s616o7IBcF98FI7K2BL8ED+MCsEqJ80oObsQr9OfySgsqDE1R+MO/ciThQCj8lrHL7B/4PF cXiHKOmoCZtds4YSVFiZg== X-UI-Out-Filterresults: notjunk:1; V01:K0:GaBOEkNzWX0=:FHnCLdTDhbkbDnd9AyNOkp oIS4p6g0tqATtnQvSHDcJ9smEnUHjh8HnJkcC4Gg1ati7OBrQ5kQvMwylI2IqiM1qDUNsQD4n BL/dOb57VWA36kFQ8ggCdX7WmT9wsPHHIEH3Exc5IMarguDKm8GmdRXd7f+RwgEYEeLeiERJy //GXhP7/OnRUZOP8K3yVy/Zd21jo5uoaZYEqdBFuFXWxCodJEYyKHpXEnWB4Hv1SVPioOZZih L4GKyTU9pLnmzpT1OZAyEQJ0lOitLOIf/HniBQX3iRnLM4q0EzkToj5/Ii5696+/CysiudOrz UjGR8jkokOF5ht8gYQbP0b3e1kaCONK7Q+ldu8x9G0wwKc1Fvj1BK9G1FpHuJ0qN0xKIUQx3o zgzX/5I3UErpguPND7Z7RHHikj+lz42B8GLl5E5XW2pohtweeGx4HPbXZonx0Mk9p7mnvC9Q/ /pihQw0ysTNkAOWj7MMYsIY2jCZb26AUQa6dAbYQWEQPJkuaH/pci9IGokc4I/qqGKEGXeQ56 gQnVQ4Q7MmrhyI6ahJ0oiGeNKFV3pPoJahz11HUCTK+zQx3mY/Y/bGbRSYBFOO2XzjUn6nGMt c8oSmDhu/po7I47E9xngCzz7aXtDYRh+n+WSufIAfu1krqNtYYYF24VfXjLU7OX+Sqv5y5YC6 lNbBuR55WZE09QSrt6/2QIkJwcE47YgG/AQik3WXTAg2QZJYL7oDUBK+LeetY5tIurawSnfU3 mhL/V8vtOThFm8/E4BWU75PP3cH9BzV4SCsTMEnVVD0LAm4lxqK5p8hCmAYnMBlvdtbTpPlv4 sP2d6nh Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Tue, 4 Apr 2017 10:20:46 +0200 Replace five goto statements (and previous variable assignments) by direct returns after a memory allocation failure in this function. Signed-off-by: Markus Elfring --- security/selinux/ss/policydb.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 0080122760ad..87d645d3a39f 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -538,34 +538,30 @@ static int policydb_index(struct policydb *p) symtab_hash_eval(p->symtab); #endif - rc = -ENOMEM; p->class_val_to_struct = kcalloc(p->p_classes.nprim, sizeof(*p->class_val_to_struct), GFP_KERNEL); if (!p->class_val_to_struct) - goto out; + return -ENOMEM; - rc = -ENOMEM; p->role_val_to_struct = kcalloc(p->p_roles.nprim, sizeof(*p->role_val_to_struct), GFP_KERNEL); if (!p->role_val_to_struct) - goto out; + return -ENOMEM; - rc = -ENOMEM; p->user_val_to_struct = kcalloc(p->p_users.nprim, sizeof(*p->user_val_to_struct), GFP_KERNEL); if (!p->user_val_to_struct) - goto out; + return -ENOMEM; /* Yes, I want the sizeof the pointer, not the structure */ - rc = -ENOMEM; p->type_val_to_struct_array = flex_array_alloc(sizeof(struct type_datum *), p->p_types.nprim, GFP_KERNEL | __GFP_ZERO); if (!p->type_val_to_struct_array) - goto out; + return -ENOMEM; rc = flex_array_prealloc(p->type_val_to_struct_array, 0, p->p_types.nprim, GFP_KERNEL | __GFP_ZERO); @@ -577,12 +573,11 @@ static int policydb_index(struct policydb *p) goto out; for (i = 0; i < SYM_NUM; i++) { - rc = -ENOMEM; p->sym_val_to_name[i] = flex_array_alloc(sizeof(char *), p->symtab[i].nprim, GFP_KERNEL | __GFP_ZERO); if (!p->sym_val_to_name[i]) - goto out; + return -ENOMEM; rc = flex_array_prealloc(p->sym_val_to_name[i], 0, p->symtab[i].nprim,