From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751387AbdAOPcU (ORCPT ); Sun, 15 Jan 2017 10:32:20 -0500 Received: from mout.web.de ([212.227.15.4]:56016 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751129AbdAOPcS (ORCPT ); Sun, 15 Jan 2017 10:32:18 -0500 Subject: [PATCH 32/46] selinux: Return directly after a failed kzalloc() in class_read() To: linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, Eric Paris , James Morris , Paul Moore , "Serge E. Hallyn" , Stephen Smalley , William Roberts References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <6ceee0fa-a0ab-fe42-4213-f7985031ddfa@users.sourceforge.net> Date: Sun, 15 Jan 2017 16:32:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:vtzcMOG6o4E4cKM4iT1YRuAjpz+X1jajPm6xM3lCub8Z226h1OX 7+MKnff9ZQYQQLEFQbYbClp6BApn6r4cRjJ+Ah8IzSOpK/aPRROudr/tKs4x1rK+JEa2tac Vcg8mJvreG6Cqbof/doSSRzv7p4aVxCMnqauF15rRFJVUCxZMJkVTRd1CHQh1ODTBcl6tFv TmsoNab60X7Xfx71wpadw== X-UI-Out-Filterresults: notjunk:1;V01:K0:wmryJJ2TjHs=:RsvDe270b4mRzWsj2URyBF eMYX8nommtA//DzghqapJKZdy8px43qxIf3gQNmufIVMi9C2SEf6QdeGItwZ5EdHbKiNAHcZs i+XOw3MTm6yuFqGTc8dMXAkTmweH8j3HfrFBFC4sPrLb4d2P8vedsiQsWFAv1zhTh+9lYKhkF aIFpEKi3DjYAzmXYDnILKIYhfmdDti4jaBRextfRgmOoNlSW+C+qiu6doM08S3C6oUXXl7pTu NIBBxpDKxMFcZ4/JRNvEHc6QeHx6nfqeVe2t9pNgBsitQYYGxgf9I7jZ2obvlr4EnSHrB94Ol CkK2AxSfZWp9HenUaczW+7rBjtKdFE4wEP654nvoVX/IQPvVe0G6QSQKqS9k3NzmRCzUmOj3Z Ezgrmt38lJ8HVlBmW3YS0wO1hDWwZCNdDzOoWDfHHmF1gUcD2PqW4LHnBvkM2TJ+K1YsSs/UZ Kt3JId4Sw6VjvxhVAbzqc+xy8KvAvsmv9OBfYZ4Dfa1oSkn4QHELoMczAs+LLNDn5CZFElHyk rz3myImLIEarz5NPl5g7asoJYZsDEKBhzxLjZjMYKBb5FTIzTR3N2LElwUQsinZLz8ok4QD2P mX4hTKsLr1eo6VSvH9IpIJ0DRymXrzKP25xIjPlSmtzSzUFKJk8GVMKLzwepUeHB55nTdh2be lmyqdL5v1NHUPJLtXecPrimBw2dAUgapboNUF2dp8qUlIx1hY8XR4RL0SAocSHgy77aXq0K2N ZIjObANudSW6tuRBM9dFKLpBVSDr3ySb2Tt81TSPwKx7/H+GpJU0ONbTYqm5BHcFbz2AbcGiW AkklI/m Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sun, 15 Jan 2017 15:32:03 +0000 Subject: [PATCH 32/46] selinux: Return directly after a failed kzalloc() in class_read() Message-Id: <6ceee0fa-a0ab-fe42-4213-f7985031ddfa@users.sourceforge.net> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, Eric Paris , James Morris , Paul Moore , "Serge E. Hallyn" , Stephen Smalley , William Roberts Cc: LKML , kernel-janitors@vger.kernel.org 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(-) 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