From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751333AbdAOPX0 (ORCPT ); Sun, 15 Jan 2017 10:23:26 -0500 Received: from mout.web.de ([212.227.15.3]:61255 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751054AbdAOPXX (ORCPT ); Sun, 15 Jan 2017 10:23:23 -0500 Subject: [PATCH 23/46] selinux: Move an assignment for a pointer in range_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: <668d71a5-d55c-449e-9de8-b5d70d7e11c9@users.sourceforge.net> Date: Sun, 15 Jan 2017 16:23:08 +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:AFtxfqgrRNos1tWSlt1Q7KVV4VS12KibCI/at+PSr4kIavnwjrX rEGve5pShk8mnpYwDphkuPa6QNzpTSkjFBakdDrHwZ2SicQl/tP/YAxx1W2j2dHCi6Y2pAi 1CrsKA/WBXpODyoZHJnxnFhPlzGhDCBWViLuFDwcV8yDourjD/fRuQYiztt0/8BIv7K6sVw ebLkevvIPnGUQyRxdKgsQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:c7OtJXj0qYI=:st7YclQsRq70QGnexILHYP 7ihVCaa08fozGX5K3jWdoAJGdhqgpi9OPhrszXJeb64yYO3xPzVLE9yxzLgJgF+sqB4B1QV34 YkVcDw8LgyKS4A/SpkEQxlu0tkoLoBpQNEVYeKuS/iOMzTjvBGteMAnVvGhoQq9sMezlRVnod sdVmckep87MawriLBEXgrj6DJazkXQky9RDdkggKO29TrHg2MmwagGLA7rMekgOtsGA4pcSyJ diC7J2NC+FygcdzRY3Cj/fpmnpVp2Yn829l2PXa5UFYpCUKQoycWOK3uARAdzWcYdtEDoIXkK E93hj7rsh8CeYyV7XKMC1Qa+5mmxr1N5nORnwBbv0yF+KR5vhh+wFhP5LrwAPpQKx4N7HTV41 DJyNkkyf/B9HF69u21JI6+LkFsoyShJrEqoxxoWoBCHiz7bcFd44OGdj5o9z1sGLulicka30k AhNemBIWs1W+tqS/tBdELG+uIOOFTcI6RbJ6c8nUjQhXIgOWb2QFB5d5BJUaN09+BIrQQagnQ UXuQA/iQMCgdqrFYbywWgkQZWIs3jRsO1wZGWnylwY4zLjSmG/Q/Xw2oaKgL5H8koCObSBgM4 jT8Ieal1JzEz0Kb/tFNUPppGnsVIJBUuszg2Rb85v/27NsKDHE3f7gVYDrkRpx944kUhT9UF4 hl2pKZOdSj6tofgHAYjr0pT1oOlscwBCTxy0uOLvKqE1qCsS1wGkdTWeFyr/43L1p2rmvUeuF dWixC1gOzoanktaENTtpbMHqWaMKicMxXqgi4b8eCyeHq04GgjIqV0O02l+OWHW8oVY99H/sr 2efUCkT 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 21:00:45 +0100 Move the assignment for the local variable "r" behind a call of the function "next_entry" at the beginning so that it will only be set after a successful call. Signed-off-by: Markus Elfring --- security/selinux/ss/policydb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 6121a26ada64..5101592ae172 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -1840,7 +1840,7 @@ u32 string_to_av_perm(struct policydb *p, u16 tclass, const char *name) static int range_read(struct policydb *p, void *fp) { struct range_trans *rt; - struct mls_range *r = NULL; + struct mls_range *r; int i, rc; __le32 buf[2]; u32 nel; @@ -1852,6 +1852,7 @@ static int range_read(struct policydb *p, void *fp) if (rc) return rc; + r = NULL; nel = le32_to_cpu(buf[0]); for (i = 0; i < nel; i++) { rt = kzalloc(sizeof(*rt), GFP_KERNEL); -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sun, 15 Jan 2017 15:23:08 +0000 Subject: [PATCH 23/46] selinux: Move an assignment for a pointer in range_read() Message-Id: <668d71a5-d55c-449e-9de8-b5d70d7e11c9@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 21:00:45 +0100 Move the assignment for the local variable "r" behind a call of the function "next_entry" at the beginning so that it will only be set after a successful call. Signed-off-by: Markus Elfring --- security/selinux/ss/policydb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 6121a26ada64..5101592ae172 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -1840,7 +1840,7 @@ u32 string_to_av_perm(struct policydb *p, u16 tclass, const char *name) static int range_read(struct policydb *p, void *fp) { struct range_trans *rt; - struct mls_range *r = NULL; + struct mls_range *r; int i, rc; __le32 buf[2]; u32 nel; @@ -1852,6 +1852,7 @@ static int range_read(struct policydb *p, void *fp) if (rc) return rc; + r = NULL; nel = le32_to_cpu(buf[0]); for (i = 0; i < nel; i++) { rt = kzalloc(sizeof(*rt), GFP_KERNEL); -- 2.11.0