From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sun, 15 Jan 2017 15:16:02 +0000 Subject: [PATCH 16/46] selinux: Move two assignments for the variable "rc" in filename_trans_read() Message-Id: 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 18:50:52 +0100 One local variable was set to an error code in two cases before a concrete error situation was detected. Thus move the corresponding assignments into if branches to indicate a software failure there. Signed-off-by: Markus Elfring --- security/selinux/ss/policydb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index e7b882251da8..106a1da1d68a 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -1930,16 +1930,17 @@ static int filename_trans_read(struct policydb *p, void *fp) ft = NULL; otype = NULL; name = NULL; - - rc = -ENOMEM; ft = kzalloc(sizeof(*ft), GFP_KERNEL); - if (!ft) + if (!ft) { + rc = -ENOMEM; goto out; + } - rc = -ENOMEM; otype = kmalloc(sizeof(*otype), GFP_KERNEL); - if (!otype) + if (!otype) { + rc = -ENOMEM; goto out; + } /* length of the path component string */ rc = next_entry(buf, fp, sizeof(u32)); -- 2.11.0